Merge branch 'main' into feature/circuittype-property-versiport

feat: complete XML documentation in Devices.Common

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpier": {
+      "version": "1.2.4",
+      "commands": [
+        "csharpier"
+      ],
+      "rollForward": false
+    }
+  }
+}

.gitignore

@@ -395,3 +395,5 @@ 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.4.0-local</Version>
+    <Version>2.19.4-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/Directory.Build.targets

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

src/PepperDash.Core/ComTextHelper.cs

@@ -0,0 +1,43 @@
+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,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
@@ -37,14 +36,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
@@ -108,7 +107,7 @@ namespace PepperDash.Core
                 TxStreamDebuggingIsEnabled = true;
 
             Debug.SetDeviceDebugSettings(ParentDeviceKey, setting);
-        
+
         }
 
         /// <summary>
@@ -136,51 +135,4 @@ 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,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 using Crestron.SimplSharp;
@@ -11,11 +12,12 @@ 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>
@@ -36,11 +38,6 @@ namespace PepperDash.Core
         /// </summary>
         public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
-        /// <summary>
-        ///// 
-        ///// </summary>
-        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
-
         /// <summary>
         /// Gets or sets the Hostname
         /// </summary>
@@ -67,7 +64,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>
@@ -83,16 +80,26 @@ namespace PepperDash.Core
         /// </summary>
         public SocketStatus ClientStatus
         {
-            get { return _ClientStatus; }
+            get { lock (_stateLock) { return _ClientStatus; } }
             private set
             {
-                if (_ClientStatus == value)
-                    return;
-                _ClientStatus = value;
-                OnConnectionChange();
+                bool shouldFireEvent = false;
+                lock (_stateLock)
+                {
+                    if (_ClientStatus != value)
+                    {
+                        _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
@@ -100,7 +107,7 @@ namespace PepperDash.Core
         /// </summary>
         public ushort UStatus
         {
-            get { return (ushort)_ClientStatus; }
+            get { lock (_stateLock) { return (ushort)_ClientStatus; } }
         }
 
         /// <summary>
@@ -111,7 +118,11 @@ namespace PepperDash.Core
         /// <summary>
         /// Will be set and unset by connect and disconnect only
         /// </summary>
-        public bool ConnectEnabled { get; private set; }
+        public bool ConnectEnabled
+        {
+            get { lock (_stateLock) { return _ConnectEnabled; } }
+            private set { lock (_stateLock) { _ConnectEnabled = value; } }
+        }
 
         /// <summary>
         /// S+ helper for AutoReconnect
@@ -127,17 +138,25 @@ namespace PepperDash.Core
         /// </summary>
         public int AutoReconnectIntervalMs { get; set; }
 
-        SshClient Client;
+        private SshClient client;
 
-        ShellStream TheStream;
+        private ShellStream shellStream;
 
-        CTimer ReconnectTimer;
+        private readonly Timer reconnectTimer;
 
         //Lock object to prevent simulatneous connect/disconnect operations
         //private CCriticalSection connectLock = new CCriticalSection();
-        private SemaphoreSlim connectLock = new SemaphoreSlim(1);
+        private readonly SemaphoreSlim connectLock = new SemaphoreSlim(1);
 
-        private bool DisconnectLogged = false;
+        // Thread-safety lock for state changes
+        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.
@@ -154,13 +173,13 @@ namespace PepperDash.Core
             Password = password;
             AutoReconnectIntervalMs = 5000;
 
-            ReconnectTimer = new CTimer(o =>
+            reconnectTimer = new Timer(o =>
                 {
-                    if (ConnectEnabled)
+                    if (ConnectEnabled) // Now thread-safe property access
                     {
                         Connect();
                     }
-                }, System.Threading.Timeout.Infinite);
+                }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
         }
 
         /// <summary>
@@ -172,23 +191,23 @@ namespace PepperDash.Core
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             AutoReconnectIntervalMs = 5000;
 
-            ReconnectTimer = new CTimer(o =>
+            reconnectTimer = new Timer(o =>
             {
-                if (ConnectEnabled)
+                if (ConnectEnabled) // Now thread-safe property access
                 {
                     Connect();
                 }
-            }, System.Threading.Timeout.Infinite);
+            }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
         }
 
         /// <summary>
         /// Handles closing this up when the program shuts down
         /// </summary>
-        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        private void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
         {
             if (programEventType == eProgramStatusEventType.Stopping)
             {
-                if (Client != null)
+                if (client != null)
                 {
                     this.LogDebug("Program stopping. Closing connection");
                     Disconnect();
@@ -223,10 +242,10 @@ namespace PepperDash.Core
                     this.LogDebug("Attempting connect");
 
                     // Cancel reconnect if running.
-                    ReconnectTimer?.Stop();
+                    StopReconnectTimer();
 
                     // 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);
@@ -239,29 +258,36 @@ namespace PepperDash.Core
 
                     this.LogDebug("Creating new SshClient");
                     ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
-                    Client = new SshClient(connectionInfo);
-                    Client.ErrorOccurred += Client_ErrorOccurred;
+                    client = new SshClient(connectionInfo);
+                    client.ErrorOccurred += Client_ErrorOccurred;
 
                     //Attempt to connect
                     ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
                     try
                     {
-                        Client.Connect();
-                        TheStream = Client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534);
-                        if (TheStream.DataAvailable)
+                        client.Connect();
+
+                        var modes = new Dictionary<TerminalModes, uint>();
+
+                        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
-                            string str = TheStream.Read();
+                            shellStream.Read();
                         }
-                        TheStream.DataReceived += Stream_DataReceived;
+                        shellStream.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)
                         {
@@ -286,37 +312,36 @@ 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);
-                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                            StartReconnectTimer();
                         }
                     }
                     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);
-                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                            StartReconnectTimer();
                         }
                     }
                     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);
-                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                            StartReconnectTimer();
                         }
                     }
                 }
@@ -334,11 +359,7 @@ namespace PepperDash.Core
         {
             ConnectEnabled = false;
             // Stop trying reconnects, if we are
-            if (ReconnectTimer != null)
-            {
-                ReconnectTimer.Stop();
-                // ReconnectTimer = null;
-            }
+            StopReconnectTimer();
 
             KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
         }
@@ -352,12 +373,12 @@ namespace PepperDash.Core
 
             try
             {
-                if (Client != null)
+                if (client != null)
                 {
-                    Client.ErrorOccurred -= Client_ErrorOccurred;
-                    Client.Disconnect();
-                    Client.Dispose();
-                    Client = null;
+                    client.ErrorOccurred -= Client_ErrorOccurred;
+                    client.Disconnect();
+                    client.Dispose();
+                    client = null;
                     ClientStatus = status;
                     this.LogDebug("Disconnected");
                 }
@@ -371,16 +392,16 @@ namespace PepperDash.Core
         /// <summary>
         /// Kills the stream
         /// </summary>
-		void KillStream()
+        private void KillStream()
         {
             try
             {
-                if (TheStream != null)
+                if (shellStream != null)
                 {
-                    TheStream.DataReceived -= Stream_DataReceived;
-                    TheStream.Close();
-                    TheStream.Dispose();
-                    TheStream = null;
+                    shellStream.DataReceived -= Stream_DataReceived;
+                    shellStream.Close();
+                    shellStream.Dispose();
+                    shellStream = null;
                     this.LogDebug("Disconnected stream");
                 }
             }
@@ -393,7 +414,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Handles the keyboard interactive authentication, should it be required.
         /// </summary>
-        void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
+        private void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
         {
             foreach (AuthenticationPrompt prompt in e.Prompts)
                 if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
@@ -403,7 +424,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Handler for data receive on ShellStream.  Passes data across to queue for line parsing.
         /// </summary>
-        void Stream_DataReceived(object sender, ShellDataEventArgs e)
+        private void Stream_DataReceived(object sender, ShellDataEventArgs e)
         {
             if (((ShellStream)sender).Length <= 0L)
             {
@@ -416,18 +437,14 @@ namespace PepperDash.Core
             if (bytesHandler != null)
             {
                 var bytes = Encoding.UTF8.GetBytes(response);
-                if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                {
-                    this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
-                }
+                this.PrintReceivedBytes(bytes);
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
 
             var textHandler = TextReceived;
             if (textHandler != null)
             {
-                if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                    this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
+                this.PrintReceivedText(response);
 
                 textHandler(this, new GenericCommMethodReceiveTextArgs(response));
             }
@@ -439,7 +456,7 @@ namespace PepperDash.Core
         /// Error event handler for client events - disconnect, etc.  Will forward those events via ConnectionChange
         /// event
         /// </summary>
-        void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
+        private void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
         {
             CrestronInvoke.BeginInvoke(o =>
             {
@@ -459,7 +476,7 @@ namespace PepperDash.Core
                 if (AutoReconnect && ConnectEnabled)
                 {
                     this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                    ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                    StartReconnectTimer();
                 }
             });
         }
@@ -467,7 +484,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Helper for ConnectionChange event
         /// </summary>
-        void OnConnectionChange()
+        private void OnConnectionChange()
         {
             ConnectionChange?.Invoke(this, new GenericSocketStatusChageEventArgs(this));
         }
@@ -482,16 +499,12 @@ namespace PepperDash.Core
         {
             try
             {
-                if (Client != null && TheStream != null && IsConnected)
+                if (client != null && shellStream != null && IsConnected)
                 {
-                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                        this.LogInformation(
-                                      "Sending {length} characters of text: '{text}'",
-                                      text.Length,
-                                      ComTextHelper.GetDebugText(text));
+                    this.PrintSentText(text);
 
-                    TheStream.Write(text);
-                    TheStream.Flush();
+                    shellStream.Write(text);
+                    shellStream.Flush();
                 }
                 else
                 {
@@ -503,7 +516,7 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                ReconnectTimer.Reset();
+                StartReconnectTimer();
             }
             catch (Exception ex)
             {
@@ -519,13 +532,12 @@ namespace PepperDash.Core
         {
             try
             {
-                if (Client != null && TheStream != null && IsConnected)
+                if (client != null && shellStream != null && IsConnected)
                 {
-                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                        this.LogInformation("Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+                    this.PrintSentBytes(bytes);
 
-                    TheStream.Write(bytes, 0, bytes.Length);
-                    TheStream.Flush();
+                    shellStream.Write(bytes, 0, bytes.Length);
+                    shellStream.Flush();
                 }
                 else
                 {
@@ -537,7 +549,7 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                ReconnectTimer.Reset();
+                StartReconnectTimer();
             }
             catch (Exception ex)
             {
@@ -546,6 +558,83 @@ 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>
-		/// Fires when data is received from the server and returns it as a Byte array
-		/// </summary>
-		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+        /// <summary>
+        /// Fires when data is received from the server and returns it as a Byte array
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
 
-		/// <summary>
-		/// Fires when data is received from the server and returns it as text
-		/// </summary>
-		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+        /// <summary>
+        /// Fires when data is received from the server and returns it as text
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
-		/// <summary>
-		/// 
-		/// </summary>
-		//public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
-		public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+        /// <summary>
+        /// 
+        /// </summary>
+        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
 
-		private string _hostname;
+        private string _hostname;
 
         /// <summary>
         /// Address of server
         /// </summary>
         public string Hostname
         {
-			get
-			{
-				return _hostname;
-			}
+            get
+            {
+                return _hostname;
+            }
 
-			set
-			{
-			 _hostname = value;
-				if (_client != null)
-				{
-					_client.AddressClientConnectedTo = _hostname;
-				}
-			}
-		}
+            set
+            {
+                _hostname = value;
+                if (_client != null)
+                {
+                    _client.AddressClientConnectedTo = _hostname;
+                }
+            }
+        }
 
         /// <summary>
         /// Gets or sets the Port
@@ -78,19 +78,19 @@ namespace PepperDash.Core
         /// </summary>
         public int BufferSize { get; set; }
 
-		/// <summary>
-		/// The actual client class
-		/// </summary>
-		private TCPClient _client;
+        /// <summary>
+        /// The actual client class
+        /// </summary>
+        private TCPClient _client;
 
-		/// <summary>
-		/// Bool showing if socket is connected
-		/// </summary>
-		public bool IsConnected 
-        { 
-            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
+        /// <summary>
+        /// Bool showing if socket is connected
+        /// </summary>
+        public bool IsConnected
+        {
+            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>
-		/// _client socket status Read only
-		/// </summary>
-		public SocketStatus ClientStatus 
-        { 
-            get 
+        /// <summary>
+        /// _client socket status Read only
+        /// </summary>
+        public SocketStatus ClientStatus
+        {
+            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>
-		public string ClientStatusText { get { return ClientStatus.ToString(); } }
+        /// </summary>
+        public string ClientStatusText { get { return ClientStatus.ToString(); } }
 
-		/// <summary>
-		/// Ushort representation of client status
-		/// </summary>
+        /// <summary>
+        /// Ushort representation of client status
+        /// </summary>
         [Obsolete]
-		public ushort UClientStatus { get { return (ushort)ClientStatus; } }
+        public ushort UClientStatus { get { return (ushort)ClientStatus; } }
 
-		/// <summary>
-		/// Connection failure reason
-		/// </summary>
-		public string ConnectionFailure { get { return ClientStatus.ToString(); } }
+        /// <summary>
+        /// Connection failure reason
+        /// </summary>
+        public string ConnectionFailure { get { return ClientStatus.ToString(); } }
 
-  /// <summary>
-  /// Gets or sets the AutoReconnect
-  /// </summary>
-		public bool AutoReconnect { get; set; }
+        /// <summary>
+        /// Gets or sets the AutoReconnect
+        /// </summary>
+        public bool AutoReconnect { get; set; }
 
         /// <summary>
         /// S+ helper for AutoReconnect
@@ -149,29 +149,29 @@ namespace PepperDash.Core
             set { AutoReconnect = value == 1; }
         }
 
-		/// <summary>
-		/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
-		/// </summary>
-		public int AutoReconnectIntervalMs { get; set; }
+        /// <summary>
+        /// Milliseconds to wait before attempting to reconnect. Defaults to 5000
+        /// </summary>
+        public int AutoReconnectIntervalMs { get; set; }
 
-		/// <summary>
-		/// Set only when the disconnect method is called
-		/// </summary>
-		bool DisconnectCalledByUser;
+        /// <summary>
+        /// Set only when the disconnect method is called
+        /// </summary>
+        bool DisconnectCalledByUser;
 
-		/// <summary>
-		/// 
-		/// </summary>
-		public bool Connected
-		{
-			get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
-		}
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool 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);
-			AutoReconnectIntervalMs = 5000;
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            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>
-  /// Deactivate method
-  /// </summary>
-		public override bool Deactivate()
-		{
+        /// <summary>
+        /// Deactivate method
+        /// </summary>
+        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>
-  /// Connect method
-  /// </summary>
-		public void Connect()
-		{
+        /// <summary>
+        /// Connect method
+        /// </summary>
+        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>
-  /// Disconnect method
-  /// </summary>
-		public void Disconnect()
-		{
+        /// <summary>
+        /// Disconnect method
+        /// </summary>
+        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,10 +426,7 @@ namespace PepperDash.Core
                     var bytesHandler = BytesReceived;
                     if (bytesHandler != null)
                     {
-                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                        {
-                            Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
-                        }
+                        this.PrintReceivedBytes(bytes);
                         bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
                     }
                     var textHandler = TextReceived;
@@ -437,58 +434,53 @@ namespace PepperDash.Core
                     {
                         var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
 
-                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                        {
-                            Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
-                        }
+                        this.PrintReceivedText(str);
 
                         textHandler(this, new GenericCommMethodReceiveTextArgs(str));
-                    }                    
+                    }
                 }
                 client.ReceiveDataAsync(Receive);
             }
-		}
+        }
 
-  /// <summary>
-  /// SendText method
-  /// </summary>
-		public void SendText(string text)
-		{
-			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
-			// Check debug level before processing byte array
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
+        /// <summary>
+        /// SendText method
+        /// </summary>
+        public void SendText(string text)
+        {
+            var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+            // Check debug level before processing byte array
+            this.PrintSentText(text);
             if (_client != null)
-			    _client.SendData(bytes, bytes.Length);
-		}
+                _client.SendData(bytes, bytes.Length);
+        }
 
-  /// <summary>
-  /// SendEscapedText method
-  /// </summary>
-		public void SendEscapedText(string text)
-		{
-			var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
-				{
-					var hex = s.Groups[1].Value;
-					return ((char)Convert.ToByte(hex, 16)).ToString();
-				});
-			SendText(unescapedText);
-		}
+        /// <summary>
+        /// SendEscapedText method
+        /// </summary>
+        public void SendEscapedText(string text)
+        {
+            var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
+                {
+                    var hex = s.Groups[1].Value;
+                    return ((char)Convert.ToByte(hex, 16)).ToString();
+                });
+            SendText(unescapedText);
+        }
 
         /// <summary>
         /// Sends Bytes to the server
         /// </summary>
         /// <param name="bytes"></param>
-  /// <summary>
-  /// SendBytes method
-  /// </summary>
-		public void SendBytes(byte[] bytes)
-		{
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+        /// <summary>
+        /// SendBytes method
+        /// </summary>
+        public void SendBytes(byte[] bytes)
+        {
+            this.PrintSentBytes(bytes);
             if (_client != null)
-			    _client.SendData(bytes, bytes.Length);
-		}
+                _client.SendData(bytes, bytes.Length);
+        }
 
         /// <summary>
         /// Socket Status Change Handler
@@ -496,7 +488,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);
@@ -505,68 +497,73 @@ namespace PepperDash.Core
             else
             {
                 Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
-			    _client.ReceiveDataAsync(Receive);
+                _client.ReceiveDataAsync(Receive);
             }
 
-			var handler = ConnectionChange;
-			if (handler != null)
-				ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
-		}
-	}
+            var handler = ConnectionChange;
+            if (handler != null)
+                ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
+        }
+    }
 
- /// <summary>
- /// Represents a TcpSshPropertiesConfig
- /// </summary>
-	public class TcpSshPropertiesConfig
-	{
+    /// <summary>
+    /// Represents a TcpSshPropertiesConfig
+    /// </summary>
+    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)]
-		public int Port { get; set; }
-		
+        [JsonProperty(Required = Required.Always)]
+        public int Port { get; set; }
+
         /// <summary>
         /// Username credential
         /// </summary>
-		public string Username { get; set; }
-  /// <summary>
-  /// Gets or sets the Password
-  /// </summary>
-		public string Password { get; set; }
+        public string Username { get; set; }
+        /// <summary>
+        /// Gets or sets the Password
+        /// </summary>
+        public string Password { get; set; }
 
-		/// <summary>
-		/// Defaults to 32768
-		/// </summary>
-		public int BufferSize { get; set; }
+        /// <summary>
+        /// Defaults to 32768
+        /// </summary>
+        public int BufferSize { get; set; }
 
-  /// <summary>
-  /// Gets or sets the AutoReconnect
-  /// </summary>
-		public bool AutoReconnect { get; set; }
+        /// <summary>
+        /// Gets or sets the AutoReconnect
+        /// </summary>
+        public bool AutoReconnect { get; set; }
 
-  /// <summary>
-  /// Gets or sets the AutoReconnectIntervalMs
-  /// </summary>
-		public int AutoReconnectIntervalMs { get; set; }
+        /// <summary>
+        /// Gets or sets the AutoReconnectIntervalMs
+        /// </summary>
+        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;
-			AutoReconnect = true;
-			AutoReconnectIntervalMs = 5000;
+        {
+            BufferSize = 32768;
+            AutoReconnect = true;
+            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="buffefSize"></param>
-        public GenericUdpServer(string key, string address, int port, int buffefSize)
+        /// <param name="bufferSize"></param>
+        public GenericUdpServer(string key, string address, int port, int bufferSize)
             : base(key)
         {
-            StreamDebugging = new CommunicationStreamDebugging(key); 
+            StreamDebugging = new CommunicationStreamDebugging(key);
             Hostname = address;
             Port = port;
-            BufferSize = buffefSize;
+            BufferSize = bufferSize;
 
             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,7 +194,21 @@ namespace PepperDash.Core
         {
             if (Server == null)
             {
-                Server = new UDPServer();
+                try
+                {
+                    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))
@@ -229,7 +243,7 @@ namespace PepperDash.Core
         /// </summary>
         public void Disconnect()
         {
-            if(Server != null)
+            if (Server != null)
                 Server.DisableUDPServer();
 
             IsConnected = false;
@@ -251,7 +265,7 @@ namespace PepperDash.Core
 
             try
             {
-                if (numBytes <= 0) 
+                if (numBytes <= 0)
                     return;
 
                 var sourceIp = Server.IPAddressLastMessageReceivedFrom;
@@ -267,17 +281,13 @@ namespace PepperDash.Core
                 var bytesHandler = BytesReceived;
                 if (bytesHandler != null)
                 {
-                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                    {
-                        Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
-                    }
+                    this.PrintReceivedBytes(bytes);
                     bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
                 }
                 var textHandler = TextReceived;
                 if (textHandler != null)
                 {
-                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                        Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                    this.PrintReceivedText(str);
                     textHandler(this, new GenericCommMethodReceiveTextArgs(str));
                 }
             }
@@ -304,8 +314,7 @@ namespace PepperDash.Core
 
             if (IsConnected && Server != null)
             {
-                if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                    Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
+                this.PrintSentText(text);
 
                 Server.SendData(bytes, bytes.Length);
             }
@@ -320,8 +329,7 @@ namespace PepperDash.Core
         /// </summary>
         public void SendBytes(byte[] bytes)
         {
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+            this.PrintSentBytes(bytes);
 
             if (IsConnected && Server != null)
                 Server.SendData(bytes, bytes.Length);
@@ -329,11 +337,11 @@ namespace PepperDash.Core
 
     }
 
- /// <summary>
- /// Represents a GenericUdpReceiveTextExtraArgs
- /// </summary>
-	public class GenericUdpReceiveTextExtraArgs : EventArgs
-	{
+    /// <summary>
+    /// Represents a GenericUdpReceiveTextExtraArgs
+    /// </summary>
+    public class GenericUdpReceiveTextExtraArgs : EventArgs
+    {
         /// <summary>
         /// 
         /// </summary>
@@ -345,7 +353,7 @@ namespace PepperDash.Core
         /// <summary>
         /// 
         /// </summary>
-		public int	Port { get; private set; }
+		public int Port { get; private set; }
         /// <summary>
         /// 
         /// </summary>
@@ -359,18 +367,18 @@ namespace PepperDash.Core
         /// <param name="port"></param>
         /// <param name="bytes"></param>
 		public GenericUdpReceiveTextExtraArgs(string text, string ipAddress, int port, byte[] bytes)
-		{
-			Text = text;
-			IpAddress = ipAddress;
-			Port = port;
-			Bytes = bytes;
-		}
+        {
+            Text = text;
+            IpAddress = ipAddress;
+            Port = port;
+            Bytes = bytes;
+        }
 
-		/// <summary>
-		/// Stupid S+ Constructor
-		/// </summary>
-		public GenericUdpReceiveTextExtraArgs() { }
-	}
+        /// <summary>
+        /// Stupid S+ Constructor
+        /// </summary>
+        public GenericUdpReceiveTextExtraArgs() { }
+    }
 
     /// <summary>
     /// 

src/PepperDash.Core/Comm/StreamDebuggingExtensions.cs

@@ -0,0 +1,69 @@
+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,6 +74,14 @@ 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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,28 @@
+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,10 +1,7 @@
 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
@@ -42,7 +39,7 @@ namespace PepperDash.Core
     /// Defines the contract for IBasicCommunication
     /// </summary>
     public interface IBasicCommunication : ICommunicationReceiver
-	{
+    {
         /// <summary>
         /// Send text to the device
         /// </summary>
@@ -54,7 +51,7 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="bytes"></param>
 		void SendBytes(byte[] bytes);
-	}
+    }
 
     /// <summary>
     /// Represents a device that implements IBasicCommunication and IStreamDebugging
@@ -67,7 +64,7 @@ namespace PepperDash.Core
     /// <summary>
     /// Represents a device with stream debugging capablities
     /// </summary>
-    public interface IStreamDebugging
+    public interface IStreamDebugging : IKeyed
     {
         /// <summary>
         /// Object to enable stream debugging
@@ -76,12 +73,12 @@ namespace PepperDash.Core
         CommunicationStreamDebugging StreamDebugging { get; }
     }
 
-	/// <summary>
-	/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
-	/// GenericTcpIpClient
-	/// </summary>
-	public interface ISocketStatus : IBasicCommunication
-	{
+    /// <summary>
+    /// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
+    /// GenericTcpIpClient
+    /// </summary>
+    public interface ISocketStatus : IBasicCommunication
+    {
         /// <summary>
         /// Notifies of socket status changes
         /// </summary>
@@ -93,7 +90,7 @@ namespace PepperDash.Core
         [JsonProperty("clientStatus")]
         [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
         SocketStatus ClientStatus { get; }
-	}
+    }
 
     /// <summary>
     /// Describes a device that implements ISocketStatus and IStreamDebugging
@@ -107,24 +104,24 @@ namespace PepperDash.Core
     /// Describes a device that can automatically attempt to reconnect
     /// </summary>
 	public interface IAutoReconnect
-	{
+    {
         /// <summary>
         /// Enable automatic recconnect
         /// </summary>
         [JsonProperty("autoReconnect")]
-		bool AutoReconnect { get; set; }
+        bool AutoReconnect { get; set; }
         /// <summary>
         /// Interval in ms to attempt automatic recconnections
         /// </summary>
         [JsonProperty("autoReconnectIntervalMs")]
-		int AutoReconnectIntervalMs { get; set; }
-	}
+        int AutoReconnectIntervalMs { get; set; }
+    }
 
-	/// <summary>
-	/// 
-	/// </summary>
-	public enum eGenericCommMethodStatusChangeType
-	{
+    /// <summary>
+    /// 
+    /// </summary>
+    public enum eGenericCommMethodStatusChangeType
+    {
         /// <summary>
         /// Connected
         /// </summary>
@@ -133,45 +130,45 @@ namespace PepperDash.Core
         /// Disconnected
         /// </summary>
         Disconnected
-	}
+    }
 
-	/// <summary>
-	/// This delegate defines handler for IBasicCommunication status changes
-	/// </summary>
-	/// <param name="comm">Device firing the status change</param>
-	/// <param name="status"></param>
-	public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
+    /// <summary>
+    /// This delegate defines handler for IBasicCommunication status changes
+    /// </summary>
+    /// <param name="comm">Device firing the status change</param>
+    /// <param name="status"></param>
+    public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
 
-	/// <summary>
-	/// 
-	/// </summary>
-	public class GenericCommMethodReceiveBytesArgs : EventArgs
-	{
-  /// <summary>
-  /// Gets or sets the Bytes
-  /// </summary>
-		public byte[] Bytes { get; private set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public class GenericCommMethodReceiveBytesArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the Bytes
+        /// </summary>
+        public byte[] Bytes { get; private set; }
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="bytes"></param>
 		public GenericCommMethodReceiveBytesArgs(byte[] bytes)
-		{
-			Bytes = bytes;
-		}
+        {
+            Bytes = bytes;
+        }
 
-		/// <summary>
-		/// S+ Constructor
-		/// </summary>
-		public GenericCommMethodReceiveBytesArgs() { }
-	}
+        /// <summary>
+        /// S+ Constructor
+        /// </summary>
+        public GenericCommMethodReceiveBytesArgs() { }
+    }
 
-	/// <summary>
-	/// 
-	/// </summary>
-	public class GenericCommMethodReceiveTextArgs : EventArgs
-	{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class GenericCommMethodReceiveTextArgs : EventArgs
+    {
         /// <summary>
         /// 
         /// </summary>
@@ -185,9 +182,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="text"></param>
 		public GenericCommMethodReceiveTextArgs(string text)
-		{
-			Text = text;
-		}
+        {
+            Text = text;
+        }
 
         /// <summary>
         /// 
@@ -195,59 +192,14 @@ 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>
-        /// Gets escaped text for a byte array
+        /// S+ Constructor
         /// </summary>
-        /// <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));
-        }
-	}
+        public GenericCommMethodReceiveTextArgs() { }
+    }
 }

src/PepperDash.Core/Config/PortalConfigReader.cs

@@ -9,40 +9,59 @@ using Serilog.Events;
 
 namespace PepperDash.Core.Config
 {
+
+
     /// <summary>
     /// Reads a Portal formatted config file
     /// </summary>
 	public class PortalConfigReader
 	{
-		/// <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)
+        const string template = "template";
+        const string system = "system";
+		const string systemUrl = "system_url";
+        const string templateUrl = "template_url";
+		const string info = "info";
+        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.Console(1, Debug.ErrorLogLevel.Error,
+					Debug.LogError(
 						"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["system_url"] != null)
+						if (jsonObj[systemUrl] != null)
 						{
-							merged["systemUrl"] = jsonObj["system_url"].Value<string>();
+							merged[systemUrl] = jsonObj[systemUrl].Value<string>();
 						}
 
-						if (jsonObj["template_url"] != null)
+						if (jsonObj[templateUrl] != null)
 						{
-							merged["templateUrl"] = jsonObj["template_url"].Value<string>();
+							merged[templateUrl] = jsonObj[templateUrl].Value<string>();
 						}
 
 						jsonObj = merged;
@@ -77,62 +96,62 @@ namespace PepperDash.Core.Config
 			var merged = new JObject();
 
 			// Put together top-level objects
-			if (system["info"] != null)
-				merged.Add("info", Merge(template["info"], system["info"], "infO"));
+			if (system[info] != null)
+				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,
-				system["devices"] as JArray, "key", "devices"));
+			merged.Add(devices, MergeArraysOnTopLevelProperty(template[devices] as JArray,
+				system[devices] as JArray, "key", devices));
 
-			if (system["rooms"] == null)
-				merged.Add("rooms", template["rooms"]);
+			if (system[rooms] == null)
+				merged.Add(rooms, template[rooms]);
 			else
-				merged.Add("rooms", MergeArraysOnTopLevelProperty(template["rooms"] as JArray,
-					system["rooms"] as JArray, "key", "rooms"));
+				merged.Add(rooms, MergeArraysOnTopLevelProperty(template[rooms] as JArray,
+					system[rooms] as JArray, "key", rooms));
 
-			if (system["sourceLists"] == null)
-				merged.Add("sourceLists", template["sourceLists"]);
+			if (system[sourceLists] == null)
+				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)
-		        merged.Add("destinationLists", template["destinationLists"]);
+		    if (system[destinationLists] == null)
+		        merged.Add(destinationLists, template[destinationLists]);
 		    else
-		        merged.Add("destinationLists",
-		            Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
+		        merged.Add(destinationLists,
+		            Merge(template[destinationLists], system[destinationLists], destinationLists));
 
 
-            if (system["cameraLists"] == null)
-                merged.Add("cameraLists", template["cameraLists"]);
+            if (system[cameraLists] == null)
+                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)
-                merged.Add("audioControlPointLists", template["audioControlPointLists"]);
+            if (system[audioControlPointLists] == null)
+                merged.Add(audioControlPointLists, template[audioControlPointLists]);
             else
-                merged.Add("audioControlPointLists",
-                    Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
+                merged.Add(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)
-				merged.Add("tieLines", template["tieLines"]);
-			else if (system["tieLines"] != null)
-				merged.Add("tieLines", system["tieLines"]);
+            if (template[tieLines] != null)
+				merged.Add(tieLines, template[tieLines]);
+			else if (system[tieLines] != null)
+				merged.Add(tieLines, system[tieLines]);
 			else
-				merged.Add("tieLines", new JArray());
+				merged.Add(tieLines, new JArray());
 
-            if (template["joinMaps"] != null)
-                merged.Add("joinMaps", template["joinMaps"]);
+            if (template[joinMaps] != null)
+                merged.Add(joinMaps, template[joinMaps]);
             else
-                merged.Add("joinMaps", new JObject());
+                merged.Add(joinMaps, new JObject());
 
-			if (system["global"] != null)
-				merged.Add("global", Merge(template["global"], system["global"], "global"));
+			if (system[global] != null)
+				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;
@@ -228,7 +247,7 @@ namespace PepperDash.Core.Config
 					}
 					catch (Exception e)
 					{
-						Debug.Console(1, Debug.ErrorLogLevel.Warning, "Cannot merge items at path {0}: \r{1}", propPath, e);
+						Debug.LogError($"Cannot merge items at path {propPath}: \r{e}");
 					}
 				}
 			}

src/PepperDash.Core/Logging/Debug.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
@@ -19,7 +20,6 @@ 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 _consoleLoggingLevelSwitch;
+        private static readonly LoggingLevelSwitch _consoleLogLevelSwitch;
 
-        private static readonly LoggingLevelSwitch _websocketLoggingLevelSwitch;
+        private static readonly LoggingLevelSwitch _websocketLogLevelSwitch;
 
         private static readonly LoggingLevelSwitch _errorLogLevelSwitch;
 
-        private static readonly LoggingLevelSwitch _fileLevelSwitch;
+        private static readonly LoggingLevelSwitch _fileLogLevelSwitch;
 
         /// <summary>
         /// Gets the minimum log level for the websocket sink.
         /// </summary>
         public static LogEventLevel WebsocketMinimumLogLevel
         {
-            get { return _websocketLoggingLevelSwitch.MinimumLevel; }
+            get { return _websocketLogLevelSwitch.MinimumLevel; }
         }
 
         private static readonly DebugWebsocketSink _websocketSink;
@@ -138,13 +138,13 @@ namespace PepperDash.Core
 
             var defaultFileLogLevel = GetStoredLogEventLevel(FileLevelStoreKey);
 
-            _consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
+            _consoleLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
 
-            _websocketLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
+            _websocketLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
 
             _errorLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultErrorLogLevel);
 
-            _fileLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultFileLogLevel);
+            _fileLogLevelSwitch = 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: _consoleLoggingLevelSwitch)
-                .WriteTo.Sink(_websocketSink, levelSwitch: _websocketLoggingLevelSwitch)
+                .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(_websocketSink, levelSwitch: _websocketLogLevelSwitch)
                 .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 ? 30 : 60,
-                    levelSwitch: _fileLevelSwitch
+                    retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 7 : 14,
+                    levelSwitch: _fileLogLevelSwitch
                 );
 
             try
@@ -237,10 +237,13 @@ 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));
 
-            _consoleLoggingLevelSwitch.MinimumLevelChanged += (sender, args) =>
+            _errorLogLevelSwitch.MinimumLevelChanged += (sender, args) =>
             {
-                LogMessage(LogEventLevel.Information, "Console debug level set to {minimumLevel}", _consoleLoggingLevelSwitch.MinimumLevel);
+                LogMessage(LogEventLevel.Information, "Error log debug level set to {minimumLevel}", _errorLogLevelSwitch.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>
@@ -272,7 +275,10 @@ 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)
@@ -281,6 +287,8 @@ namespace PepperDash.Core
                     return LogEventLevel.Information;
                 }
 
+                CrestronConsole.PrintLine($"Stored log level for {levelStoreKey} is {logLevel}");
+
                 return (LogEventLevel)logLevel;
             }
             catch (Exception ex)
@@ -346,44 +354,104 @@ namespace PepperDash.Core
                 if (levelString.Trim() == "?")
                 {
                     CrestronConsole.ConsoleCommandResponse(
-                    $@"Used to set the minimum level of debug messages to be printed to the console:
-{_logLevels[0]} = 0
-{_logLevels[1]} = 1
-{_logLevels[2]} = 2
-{_logLevels[3]} = 3
-{_logLevels[4]} = 4
-{_logLevels[5]} = 5");
+                    "Used to set the minimum level of debug messages:\r\n" +
+                    "Usage: appdebug:P [sink] [level]\r\n" +
+                    "  sink: console (default), errorlog, file, all\r\n" +
+                    "  all: sets all sinks to the specified level\r\n" +
+                    "  level: 0-5 or LogEventLevel name\r\n" +
+                    $"{_logLevels[0]} = 0\r\n" +
+                    $"{_logLevels[1]} = 1\r\n" +
+                    $"{_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("AppDebug level = {0}", _consoleLoggingLevelSwitch.MinimumLevel);
+                    CrestronConsole.ConsoleCommandResponse("Console log level = {0}\r\n", _consoleLogLevelSwitch.MinimumLevel);
+                    CrestronConsole.ConsoleCommandResponse("File log level = {0}\r\n", _fileLogLevelSwitch.MinimumLevel);
+                    CrestronConsole.ConsoleCommandResponse("Error log level = {0}\r\n", _errorLogLevelSwitch.MinimumLevel);
                     return;
                 }
 
-                if (int.TryParse(levelString, out var levelInt))
+                // Parse tokens: first token is sink (defaults to console), second token is level
+                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 {levelString} to valid log level. If using a number, value must be between 0-5");
+                        CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelToken} to valid log level. If using a number, value must be between 0-5");
                         return;
                     }
-                    SetDebugLevel((uint)levelInt);
-                    return;
-                }
 
-                if (Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
+                    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))
                 {
-                    SetDebugLevel(levelEnum);
+                    // Successfully parsed as LogEventLevel enum
+                }
+                else
+                {
+                    CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelToken} to valid log level");
                     return;
                 }
 
-                CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level");
+                // Set the level for the specified sink
+                switch (sinkName)
+                {
+                    case "console":
+                        SetDebugLevel(level);
+                        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;
+                }
             }
             catch
             {
-                CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [0-5]");
+                CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [sink] [level]");
             }
         }
 
@@ -413,10 +481,10 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetDebugLevel(LogEventLevel level)
         {
-            _consoleLoggingLevelSwitch.MinimumLevel = level;
+            _consoleLogLevelSwitch.MinimumLevel = level;
 
-            CrestronConsole.ConsoleCommandResponse("[Application {0}], Debug level set to {1}\r\n",
-                InitialParametersClass.ApplicationNumber, _consoleLoggingLevelSwitch.MinimumLevel);
+            CrestronConsole.ConsoleCommandResponse("[Application {0}] Debug level set to {1}\r\n",
+                InitialParametersClass.ApplicationNumber, _consoleLogLevelSwitch.MinimumLevel);
 
             CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
 
@@ -433,14 +501,14 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetWebSocketMinimumDebugLevel(LogEventLevel level)
         {
-            _websocketLoggingLevelSwitch.MinimumLevel = level;
+            _websocketLogLevelSwitch.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}", _websocketLoggingLevelSwitch.MinimumLevel);
+            LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLogLevelSwitch.MinimumLevel);
         }
 
         /// <summary>
@@ -450,12 +518,17 @@ namespace PepperDash.Core
         {
             _errorLogLevelSwitch.MinimumLevel = level;
 
-            var err = CrestronDataStoreStatic.SetLocalUintValue(ErrorLogLevelStoreKey, (uint)level);
+            CrestronConsole.ConsoleCommandResponse("[Application {0}] Error log level set to {1}\r\n",
+                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)
-                LogMessage(LogEventLevel.Information, "Error saving Error Log debug level setting: {error}", err);
-
-            LogMessage(LogEventLevel.Information, "Error log debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
+                CrestronConsole.PrintLine($"Error saving error log debug level setting: {err}");
         }
 
         /// <summary>
@@ -463,14 +536,19 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetFileMinimumDebugLevel(LogEventLevel level)
         {
-            _errorLogLevelSwitch.MinimumLevel = level;
+            _fileLogLevelSwitch.MinimumLevel = level;
 
-            var err = CrestronDataStoreStatic.SetLocalUintValue(ErrorLogLevelStoreKey, (uint)level);
+            CrestronConsole.ConsoleCommandResponse("[Application {0}] File log level set to {1}\r\n",
+                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)
-                LogMessage(LogEventLevel.Information, "Error saving File debug level setting: {error}", err);
-
-            LogMessage(LogEventLevel.Information, "File debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
+                CrestronConsole.PrintLine($"Error saving file debug level setting: {err}");
         }
 
         /// <summary>
@@ -1003,9 +1081,6 @@ 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)
         {
@@ -1018,9 +1093,6 @@ 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 Serilog.Events;
-using System;
+using System;
+using Serilog.Events;
 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, args);
+            Log.LogMessage(ex, message, device: 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.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
+            Log.LogVerbose(ex, device, message, args);
         }
 
         /// <summary>
@@ -27,7 +27,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogVerbose(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Verbose, device, message, args);
+            Log.LogVerbose(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.LogMessage(LogEventLevel.Debug, ex, message, device, args);
+            Log.LogDebug(ex, device, message, args);
         }
 
         /// <summary>
@@ -43,7 +43,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogDebug(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Debug, device, message, args);
+            Log.LogDebug(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.LogMessage(LogEventLevel.Information, ex, message, device, args);
+            Log.LogInformation(ex, device, message, args);
         }
 
         /// <summary>
@@ -59,7 +59,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogInformation(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Information, device, message, args);
+            Log.LogInformation(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.LogMessage(LogEventLevel.Warning, ex, message, device, args);
+            Log.LogWarning(ex, device, message, args);
         }
 
         /// <summary>
@@ -75,7 +75,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogWarning(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Warning, device, message, args);
+            Log.LogWarning(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.LogMessage(LogEventLevel.Error, ex, message, device, args);
+            Log.LogError(ex, device, message, args);
         }
 
         /// <summary>
@@ -91,7 +91,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogError(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Error, device, message, args);
+            Log.LogError(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.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
+            Log.LogFatal(ex, device, message, args);
         }
 
         /// <summary>
@@ -107,7 +107,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogFatal(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Fatal, device, message, args);
+            Log.LogFatal(device, message, args);
         }
     }
 }

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

@@ -3,26 +3,28 @@
 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)
         {
@@ -31,23 +33,36 @@ namespace PepperDash.Essentials.Core.Bridges
     }
 
     /// <summary>
-    /// Represents a EiscApiAdvanced
+    /// Class to link devices and rooms to an EISC Instance
     /// </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;
 
@@ -62,8 +77,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         /// <summary>
         /// CustomActivate method
-        /// </summary>
-        /// <inheritdoc />
+        /// </summary>        
         public override bool CustomActivate()
         {
             CommunicationMonitor.Start();
@@ -85,7 +99,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (PropertiesConfig.Devices == null)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "No devices linked to this bridge");
+                this.LogDebug("No devices linked to this bridge");
                 return;
             }
 
@@ -106,9 +120,7 @@ namespace PepperDash.Essentials.Core.Bridges
                     continue;
                 }
 
-                Debug.LogMessage(LogEventLevel.Information, this,
-                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                        device.Key);
+                this.LogWarning("{deviceKey} is not compatible with this bridge type. Please update the device.", device.Key);
             }
         }
 
@@ -123,34 +135,31 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
             {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Registration result: {0}", registerResult);
+                this.LogVerbose("Registration result: {registerResult}", registerResult);
                 return;
             }
 
-            Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
+            this.LogDebug("EISC registration successful");
         }
 
         /// <summary>
-        /// LinkRooms method
+        /// Link rooms to this EISC. Rooms MUST implement IBridgeAdvanced
         /// </summary>
         public void LinkRooms()
         {
-            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
+            this.LogDebug("Linking Rooms...");
 
             if (PropertiesConfig.Rooms == null)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "No rooms linked to this bridge.");
+                this.LogDebug("No rooms linked to this bridge.");
                 return;
             }
 
             foreach (var room in PropertiesConfig.Rooms)
             {
-                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
-
-                if (rm == null)
+                if (!(DeviceManager.GetDeviceForKey(room.RoomKey) is IBridgeAdvanced rm))
                 {
-                    Debug.LogMessage(LogEventLevel.Debug, this,
-                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                    this.LogDebug("Room {roomKey} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
                     continue;
                 }
 
@@ -161,11 +170,8 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Adds a join map
         /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="joinMap"></param>
-        /// <summary>
-        /// AddJoinMap method
-        /// </summary>
+        /// <param name="deviceKey">The key of the device to add the join map for</param>
+        /// <param name="joinMap">The join map to add</param>        
         public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
         {
             if (!JoinMaps.ContainsKey(deviceKey))
@@ -174,14 +180,13 @@ namespace PepperDash.Essentials.Core.Bridges
             }
             else
             {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
+                this.LogWarning("Unable to add join map with key '{deviceKey}'.  Key already exists in JoinMaps dictionary", deviceKey);
             }
         }
 
         /// <summary>
         /// PrintJoinMaps method
-        /// </summary>
-        /// <inheritdoc />
+        /// </summary>        
         public virtual void PrintJoinMaps()
         {
             CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
@@ -192,17 +197,17 @@ namespace PepperDash.Essentials.Core.Bridges
                 joinMap.Value.PrintJoinMapInfo();
             }
         }
+
         /// <summary>
         /// MarkdownForBridge method
-        /// </summary>
-        /// <inheritdoc />
+        /// </summary>        
         public virtual void MarkdownForBridge(string bridgeKey)
         {
-            Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
+            this.LogInformation("Writing Joinmaps to files for EISC IPID: {eiscId}", Eisc.ID.ToString("X"));
 
             foreach (var joinMap in JoinMaps)
             {
-                Debug.LogMessage(LogEventLevel.Information, "Generating markdown for device '{0}':", joinMap.Key);
+                this.LogInformation("Generating markdown for device '{deviceKey}':", joinMap.Key);
                 joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
             }
         }
@@ -210,53 +215,45 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Prints the join map for a device by key
         /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <summary>
-        /// PrintJoinMapForDevice method
-        /// </summary>
+        /// <param name="deviceKey">The key of the device to print the join map for</param>        
         public void PrintJoinMapForDevice(string deviceKey)
         {
             var joinMap = JoinMaps[deviceKey];
 
             if (joinMap == null)
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+                this.LogInformation("Unable to find joinMap for device with key: '{deviceKey}'", deviceKey);
                 return;
             }
 
-            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
+            this.LogInformation("Join map for device '{deviceKey}' on EISC '{eiscKey}':", deviceKey, Key);
             joinMap.PrintJoinMapInfo();
         }
         /// <summary>
-        /// Prints the join map for a device by key
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <summary>
-        /// MarkdownJoinMapForDevice method
+        /// Prints the join map for a device by key in Markdown format
         /// </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)
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+                this.LogInformation("Unable to find joinMap for device with key: '{deviceKey}'", deviceKey);
                 return;
             }
 
-            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
+            this.LogInformation("Join map for device '{deviceKey}' on EISC '{eiscKey}':", 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"></param>
-        /// <param name="type"></param>
-        /// <param name="state"></param>
-        /// <summary>
-        /// ExecuteJoinAction method
-        /// </summary>
+        /// <param name="join">The join number to execute the action for</param>
+        /// <param name="type">The type of join (digital, analog, serial)</param>
+        /// <param name="state">The state to pass to the action</param>        
         public void ExecuteJoinAction(uint join, string type, object state)
         {
             try
@@ -265,78 +262,87 @@ namespace PepperDash.Essentials.Core.Bridges
                 {
                     case "digital":
                         {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
-                            if (uo != null)
+                            if (Eisc.BooleanOutput[join].UserObject is Action<bool> userObject)
                             {
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToBoolean(state));
+                                this.LogVerbose("Executing Boolean Action");
+                                userObject(Convert.ToBoolean(state));
                             }
                             else
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
+                                this.LogVerbose("User Object is null.  Nothing to Execute");
                             break;
                         }
                     case "analog":
                         {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
-                            if (uo != null)
+                            if (Eisc.UShortOutput[join].UserObject is Action<ushort> userObject)
                             {
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToUInt16(state));
+                                this.LogVerbose("Executing Analog Action");
+                                userObject(Convert.ToUInt16(state));
                             }
                             else
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute"); break;
+                                this.LogVerbose("User Object is null.  Nothing to Execute");
+                            break;
                         }
                     case "serial":
                         {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
-                            if (uo != null)
+                            if (Eisc.StringOutput[join].UserObject is Action<string> userObject)
                             {
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToString(state));
+                                this.LogVerbose("Executing Serial Action");
+                                userObject(Convert.ToString(state));
                             }
                             else
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
+                                this.LogVerbose("User Object is null.  Nothing to Execute");
                             break;
                         }
                     default:
                         {
-                            Debug.LogMessage(LogEventLevel.Verbose, "Unknown join type.  Use digital/serial/analog");
+                            this.LogVerbose("Unknown join type.  Use digital/serial/analog");
                             break;
                         }
                 }
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+                this.LogError("ExecuteJoinAction error: {message}", e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
 
         }
 
         /// <summary>
-        /// Handles incoming sig changes
+        /// Handle incoming sig changes
         /// </summary>
-        /// <param name="currentDevice"></param>
-        /// <param name="args"></param>
+        /// <param name="currentDevice">BasicTriList device that triggered the event</param>
+        /// <param name="args">Event arguments containing the signal information</param>
         protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
         {
             try
             {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-                var uo = args.Sig.UserObject;
+                this.LogVerbose("EiscApiAdvanced change: {type} {number}={value}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                var userObject = args.Sig.UserObject;
 
-                if (uo == null) return;
+                if (userObject == null) return;
 
-                Debug.LogMessage(LogEventLevel.Debug, this, "Executing Action: {0}", uo.ToString());
-                if (uo is Action<bool>)
-                    (uo as Action<bool>)(args.Sig.BoolValue);
-                else if (uo is Action<ushort>)
-                    (uo as Action<ushort>)(args.Sig.UShortValue);
-                else if (uo is Action<string>)
-                    (uo as Action<string>)(args.Sig.StringValue);
+
+                if (userObject is Action<bool>)
+                {
+                    this.LogDebug("Executing Boolean Action");
+                    (userObject as Action<bool>)(args.Sig.BoolValue);
+                }
+                else if (userObject is Action<ushort>)
+                {
+                    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)
             {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Error in Eisc_SigChange handler: {0}", e);
+                this.LogError("Eisc_SigChange handler error: {message}", e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
         }
 
@@ -355,22 +361,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; }
 
 
@@ -379,22 +385,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; }
         }
 
@@ -403,44 +409,55 @@ 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>
-    /// Represents a EiscApiAdvancedFactory
+    /// Factory class for EiscApiAdvanced devices
     /// </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" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced", "eiscapiadvudp", "eiscapiadvancedudp" };
         }
 
-        /// <summary>
-        /// BuildDevice method
-        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
+            Debug.LogDebug("Attempting to create new EiscApiAdvanced Device");
 
             var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
 
@@ -448,6 +465,13 @@ 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":
                     {
@@ -470,7 +494,7 @@ namespace PepperDash.Essentials.Core.Bridges
                     {
                         if (string.IsNullOrEmpty(controlProperties.RoomId))
                         {
-                            Debug.LogMessage(LogEventLevel.Information, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
+                            Debug.LogInformation("Unable to build VC-4 EISC Client for device {deviceKey}. Room ID is missing or empty", dc.Key);
                             eisc = null;
                             break;
                         }

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

@@ -10,6 +10,10 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public static class BridgeHelper
     {
+        /// <summary>
+        /// PrintJoinMp method
+        /// </summary>
+        /// <param name="command">target bridgekey to print join map for</param>
         public static void PrintJoinMap(string command)
         {
             var targets = command.Split(' ');

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

@@ -7,6 +7,13 @@ 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/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -7,50 +7,86 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Air Media Online status
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Air Media In Sharing Session status
+        /// </summary>
         [JoinName("IsInSession")]
         public JoinDataComplete IsInSession = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media In Sharing Session", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Air Media Has HDMI Video Sync status
+        /// </summary>
         [JoinName("HdmiVideoSync")]
         public JoinDataComplete HdmiVideoSync = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Has HDMI Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Air Media Automatic Input Routing Enable(d)
+        /// </summary>
         [JoinName("AutomaticInputRoutingEnabled")]
         public JoinDataComplete AutomaticInputRoutingEnabled = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Automatic Input Routing Enable(d)", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Air Media Video Route Select / Feedback
+        /// </summary>
         [JoinName("VideoOut")]
         public JoinDataComplete VideoOut = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Video Route Select / Feedback", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Air Media Error Status Feedback
+        /// </summary>
         [JoinName("ErrorFB")]
         public JoinDataComplete ErrorFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Error Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Air Media Number of Users Connected Feedback
+        /// </summary>
         [JoinName("NumberOfUsersConnectedFB")]
         public JoinDataComplete NumberOfUsersConnectedFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Number of Users Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Air Media Login Code Set / Get
+        /// </summary>
         [JoinName("LoginCode")]
         public JoinDataComplete LoginCode = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Login Code Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Air Media Device Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Air Media IP Address Feedback
+        /// </summary>
         [JoinName("ConnectionAddressFB")]
         public JoinDataComplete ConnectionAddressFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media IP Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Air Media Hostname Feedback
+        /// </summary>
         [JoinName("HostnameFB")]
         public JoinDataComplete HostnameFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Hostname", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Air Media Serial Number Feedback
+        /// </summary>
         [JoinName("SerialNumberFeedback")]
         public JoinDataComplete SerialNumberFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -7,30 +7,51 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class AppleTvJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// AppleTv Nav Up
+        /// </summary>
         [JoinName("UpArrow")]
         public JoinDataComplete UpArrow = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// AppleTv Nav Down
+        /// </summary>
         [JoinName("DnArrow")]
         public JoinDataComplete DnArrow = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// AppleTv Nav Left
+        /// </summary>
         [JoinName("LeftArrow")]
         public JoinDataComplete LeftArrow = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// AppleTv Nav Right
+        /// </summary>
         [JoinName("RightArrow")]
         public JoinDataComplete RightArrow = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// AppleTv Menu
+        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// AppleTv Select
+        /// </summary>
         [JoinName("Select")]
         public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// AppleTv Play/Pause
+        /// </summary>
         [JoinName("PlayPause")]
         public JoinDataComplete PlayPause = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Play/Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

@@ -7,22 +7,37 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// C2nRthsController Online status
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Temperature Format (C/F)
+        /// </summary>
         [JoinName("TemperatureFormat")]
         public JoinDataComplete TemperatureFormat = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Unit Format", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Temperature Sensor Feedbacks
+        /// </summary>
         [JoinName("Temperature")]
         public JoinDataComplete Temperature = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Temperature Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Humidity Sensor Feedbacks
+        /// </summary>
         [JoinName("Humidity")]
         public JoinDataComplete Humidity = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Humidity Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Temp Sensor Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -7,46 +7,117 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class CameraControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Tilt Up
+        /// </summary>
         [JoinName("TiltUp")]
         public JoinDataComplete TiltUp = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Tilt Down
+        /// </summary>
         [JoinName("TiltDown")]
         public JoinDataComplete TiltDown = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Pan Left
+        /// </summary>
         [JoinName("PanLeft")]
         public JoinDataComplete PanLeft = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Pan Right
+        /// </summary>
         [JoinName("PanRight")]
         public JoinDataComplete PanRight = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Zoom In
+        /// </summary>
         [JoinName("ZoomIn")]
         public JoinDataComplete ZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom In", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Zoom Out
+        /// </summary>
         [JoinName("ZoomOut")]
         public JoinDataComplete ZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom Out", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Is Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Power On
+        /// </summary>
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Power Off
+        /// </summary>
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Number Of Presets
+        /// </summary>
         [JoinName("NumberOfPresets")]
         public JoinDataComplete NumberOfPresets = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata { Description = "Tells Essentials the number of defined presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+        
+        /// <summary>
+        /// Preset Recall Start
+        /// </summary>
         [JoinName("PresetRecallStart")]
         public JoinDataComplete PresetRecallStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Recall Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Preset Label Start
+        /// </summary>
         [JoinName("PresetLabelStart")]
         public JoinDataComplete PresetLabelStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Label Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+        
+        /// <summary>
+        /// Preset Save Start
+        /// </summary>
         [JoinName("PresetSaveStart")]
         public JoinDataComplete PresetSaveStart = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Save Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Camera Mode Auto
+        /// </summary>
         [JoinName("CameraModeAuto")]
         public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Camera Mode Manual
+        /// </summary>
         [JoinName("CameraModeManual")]
         public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Camera Mode Off
+        /// </summary>
         [JoinName("CameraModeOff")]
         public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Supports Camera Mode Manual
+        /// </summary>
         [JoinName("SupportsCameraModeAuto")]
         public JoinDataComplete SupportsCameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 55, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Auto", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Supports Camera Mode Off
+        /// </summary>
         [JoinName("SupportsCameraModeOff")]
         public JoinDataComplete SupportsCameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 56, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        
+        /// <summary>
+        /// Supports Presets
+        /// </summary>
         [JoinName("SupportsPresets")]
         public JoinDataComplete SupportsPresets = new JoinDataComplete(new JoinData { JoinNumber = 57, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs

@@ -9,130 +9,226 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         #region Digitals
 
+        /// <summary>
+        /// Online
+        /// </summary>
         [JoinName("Online")]
         public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Force Occupied
+        /// </summary>
         [JoinName("ForceOccupied")]
         public JoinDataComplete ForceOccupied = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Force Occupied", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Force Vacant
+        /// </summary>
         [JoinName("ForceVacant")]
         public JoinDataComplete ForceVacant = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Force Vacant", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Enable Raw States
+        /// </summary>
         [JoinName("EnableRawStates")]
         public JoinDataComplete EnableRawStates = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Raw States", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Disable Raw States
+        /// </summary>
         [JoinName("RoomOccupiedFeedback")]
         public JoinDataComplete RoomOccupiedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Room Occupied Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Grace Occupancy Detected Feedback
+        /// </summary>
         [JoinName("GraceOccupancyDetectedFeedback")]
         public JoinDataComplete GraceOccupancyDetectedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Grace Occupancy Detected Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Room Vacant Feedback
+        /// </summary>
         [JoinName("RoomVacantFeedback")]
         public JoinDataComplete RoomVacantFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Room Vacant Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Raw Occupancy Feedback
+        /// </summary>
         [JoinName("RawOccupancyFeedback")]
         public JoinDataComplete RawOccupancyFeedback = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Raw Occupancy Pir Feedback
+        /// </summary>
         [JoinName("RawOccupancyPirFeedback")]
         public JoinDataComplete RawOccupancyPirFeedback = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Pir Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Raw Occupancy Us Feedback
+        /// </summary>
         [JoinName("RawOccupancyUsFeedback")]
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Identity Mode On
+        /// </summary>
         [JoinName("IdentityModeOn")]
         public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Identity Mode Off
+        /// </summary>
         [JoinName("IdentityModeFeedback")]
         public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Enable Led Flash
+        /// </summary>
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Disable Led Flash
+        /// </summary>
         [JoinName("DisableLedFlash")]
         public JoinDataComplete DisableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Led Flash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Enable Short Timeout
+        /// </summary>
         [JoinName("EnableShortTimeout")]
         public JoinDataComplete EnableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Short Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Disable Short Timeout
+        /// </summary>
         [JoinName("DisableShortTimeout")]
         public JoinDataComplete DisableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Short Timeout", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Or When Vacated
+        /// </summary>
         [JoinName("OrWhenVacated")]
         public JoinDataComplete OrWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Or When Vacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// And When Vacated
+        /// </summary>
         [JoinName("AndWhenVacated")]
         public JoinDataComplete AndWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "AndWhenVacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Enable Us A
+        /// </summary>
         [JoinName("EnableUsA")]
         public JoinDataComplete EnableUsA = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Us A", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Disable Us A
+        /// </summary>
         [JoinName("DisableUsA")]
         public JoinDataComplete DisableUsA = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Us A", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Enable Us B
+        /// </summary>
         [JoinName("EnableUsB")]
         public JoinDataComplete EnableUsB = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Us B", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Disable Us B
+        /// </summary>
         [JoinName("DisableUsB")]
         public JoinDataComplete DisableUsB = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Us B", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Enable Pir
+        /// </summary>
         [JoinName("EnablePir")]
         public JoinDataComplete EnablePir = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Pir", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Disable Pir
+        /// </summary>
         [JoinName("DisablePir")]
         public JoinDataComplete DisablePir = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Pir", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Increment Us In Occupied State
+        /// </summary>
         [JoinName("IncrementUsInOccupiedState")]
         public JoinDataComplete IncrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Us In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Decrement Us In Occupied State
+        /// </summary>
         [JoinName("DecrementUsInOccupiedState")]
         public JoinDataComplete DecrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Dencrement Us In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Increment Us In Vacant State
+        /// </summary>
         [JoinName("IncrementUsInVacantState")]
         public JoinDataComplete IncrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Decrement Us In Vacant State
+        /// </summary>
         [JoinName("DecrementUsInVacantState")]
         public JoinDataComplete DecrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Decrement Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Increment Pir In Occupied State
+        /// </summary>
         [JoinName("IncrementPirInOccupiedState")]
         public JoinDataComplete IncrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Pir In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Decrement Pir In Occupied State
+        /// </summary>
         [JoinName("DecrementPirInOccupiedState")]
         public JoinDataComplete DecrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Decrement Pir In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Increment Pir In Vacant State
+        /// </summary>
         [JoinName("IncrementPirInVacantState")]
         public JoinDataComplete IncrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Decrement Pir In Vacant State
+        /// </summary>
         [JoinName("DecrementPirInVacantState")]
         public JoinDataComplete DecrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Decrement Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
@@ -140,31 +236,51 @@ namespace PepperDash.Essentials.Core.Bridges
         #endregion
 
         #region Analog
-
+        /// <summary>
+        /// Timeout
+        /// </summary>
         [JoinName("Timeout")]
         public JoinDataComplete Timeout = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Timeout Local Feedback
+        /// </summary>
         [JoinName("TimeoutLocalFeedback")]
         public JoinDataComplete TimeoutLocalFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Timeout Local Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Internal PhotoSensor Value
+        /// </summary>
         [JoinName("InternalPhotoSensorValue")]
         public JoinDataComplete InternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Internal PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// External PhotoSensor Value
+        /// </summary>
         [JoinName("UsSensitivityInOccupiedState")]
         public JoinDataComplete UsSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Us Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Us Sensitivity In Vacant State
+        /// </summary>
         [JoinName("UsSensitivityInVacantState")]
         public JoinDataComplete UsSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Us Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Pir Sensitivity In Occupied State
+        /// </summary>
         [JoinName("PirSensitivityInOccupiedState")]
         public JoinDataComplete PirSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Pir Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Pir Sensitivity In Vacant State
+        /// </summary>
         [JoinName("PirSensitivityInVacantState")]
         public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Pir Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
@@ -173,6 +289,9 @@ namespace PepperDash.Essentials.Core.Bridges
 
         #region Serial
 
+        /// <summary>
+        /// Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs

@@ -7,62 +7,107 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class DisplayControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// Power Off
+        /// </summary>
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Power On
+        /// </summary>
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Is Two Way Display
+        /// </summary>
         [JoinName("IsTwoWayDisplay")]
         public JoinDataComplete IsTwoWayDisplay = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Is Two Way Display", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Volume Up
+        /// </summary>
         [JoinName("VolumeUp")]
         public JoinDataComplete VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Volume Level
+        /// </summary>
         [JoinName("VolumeLevel")]
         public JoinDataComplete VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Volume Level", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Volume Down
+        /// </summary>
         [JoinName("VolumeDown")]
         public JoinDataComplete VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Volume Mute
+        /// </summary>
         [JoinName("VolumeMute")]
         public JoinDataComplete VolumeMute = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Mute", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Volume Mute On
+        /// </summary>
         [JoinName("VolumeMuteOn")]
         public JoinDataComplete VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Mute On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Volume Mute Off
+        /// </summary>
         [JoinName("VolumeMuteOff")]
         public JoinDataComplete VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Mute Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Input Select Offset
+        /// </summary>
         [JoinName("InputSelectOffset")]
         public JoinDataComplete InputSelectOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
             new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Input Names Offset
+        /// </summary>
         [JoinName("InputNamesOffset")]
         public JoinDataComplete InputNamesOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
             new JoinMetadata { Description = "Input Names Offset", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// Input Select
+        /// </summary>
         [JoinName("InputSelect")]
         public JoinDataComplete InputSelect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Button Visibility Offset
+        /// </summary>
         [JoinName("ButtonVisibilityOffset")]
         public JoinDataComplete ButtonVisibilityOffset = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 }, 
             new JoinMetadata { Description = "Button Visibility Offset", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
-
+        
+        /// <summary>
+        /// Is Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

@@ -6,50 +6,86 @@ namespace PepperDash.Essentials.Core.Bridges {
     /// </summary>
     public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
 
+        /// <summary>
+        /// DM Blade Chassis Online status
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Blade Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Blade Input Video Sync
+        /// </summary>
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Input Endpoint Online
+        /// </summary>
         [JoinName("InputEndpointOnline")]
         public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Output Endpoint Online
+        /// </summary>
         [JoinName("OutputEndpointOnline")]
         public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Tx Advanced Is Present
+        /// </summary>
         [JoinName("TxAdvancedIsPresent")]
         public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Rx Advanced Is Present
+        /// </summary>
         [JoinName("OutputVideo")]
         public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Output Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Input HDCP Support State
+        /// </summary>
         [JoinName("HdcpSupportState")]
         public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Input HDCP Support Capability
+        /// </summary>
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Input Names
+        /// </summary>
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Output Names
+        /// </summary>
         [JoinName("OutputNames")]
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Video Output Currently Routed Video Input Name
+        /// </summary>
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Blade Chassis Input Current Resolution
+        /// </summary>
         [JoinName("InputCurrentResolution")]
         public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -7,6 +7,9 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// DM Chassis enable audio breakaway routing
+        /// </summary>
         [JoinName("EnableAudioBreakaway")]
         public JoinDataComplete EnableAudioBreakaway = new JoinDataComplete(
             new JoinData {JoinNumber = 4, JoinSpan = 1},
@@ -16,7 +19,10 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
-
+        
+        /// <summary>
+        /// DM Chassis enable USB breakaway routing
+        /// </summary>
         [JoinName("EnableUsbBreakaway")]
         public JoinDataComplete EnableUsbBreakaway = new JoinDataComplete(
             new JoinData { JoinNumber = 5, JoinSpan = 1 },
@@ -26,83 +32,143 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
-
+        
+        /// <summary>
+        /// DM Chassis Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis SystemId Get/Set/Trigger
+        /// </summary>
         [JoinName("SystemId")]
         public JoinDataComplete SystemId = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis SystemId Get/Set/Trigger/", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalog });
-
+        
+        /// <summary>
+        /// DM Chassis Online status
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Input Video Sync
+        /// </summary>
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Input Endpoint Online
+        /// </summary>
         [JoinName("InputEndpointOnline")]
         public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Output Endpoint Online
+        /// </summary>
         [JoinName("OutputEndpointOnline")]
         public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Tx Advanced Is Present
+        /// </summary>
         [JoinName("TxAdvancedIsPresent")]
         public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Rx Advanced Is Present
+        /// </summary>
         [JoinName("OutputDisabledByHdcp")]
         public JoinDataComplete OutputDisabledByHdcp = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Disabled by HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Output Set / Get
+        /// </summary>
         [JoinName("OutputVideo")]
         public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Output Audio Set / Get
+        /// </summary>
         [JoinName("OutputAudio")]
         public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Input Set / Get
+        /// </summary>
         [JoinName("OutputUsb")]
         public JoinDataComplete OutputUsb = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output USB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Input Set / Get
+        /// </summary>
         [JoinName("InputUsb")]
         public JoinDataComplete InputUsb = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Usb Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Input HDCP Support State
+        /// </summary>
         [JoinName("HdcpSupportState")]
         public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Input HDCP Support Capability
+        /// </summary>
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback
+        /// </summary>
         [JoinName("InputStreamCardState")]
         public JoinDataComplete InputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback
+        /// </summary>
         [JoinName("OutputStreamCardState")]
         public JoinDataComplete OutputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1601, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis No Route Name
+        /// </summary>
         [JoinName("NoRouteName")]
         public JoinDataComplete NoRouteName = new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis Input Names
+        /// </summary>
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis Output Names
+        /// </summary>
         [JoinName("OutputNames")]
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis Video Input Names
+        /// </summary>
         [JoinName("InputVideoNames")] public JoinDataComplete InputVideoNames =
             new JoinDataComplete(new JoinData {JoinNumber = 501, JoinSpan = 200},
                 new JoinMetadata
@@ -111,7 +177,10 @@ namespace PepperDash.Essentials.Core.Bridges
                     JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                     JoinType = eJoinType.Serial
                 });
-
+        
+        /// <summary>
+        /// DM Chassis Audio Input Names
+        /// </summary>
         [JoinName("InputAudioNames")]
         public JoinDataComplete InputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 200 },
@@ -121,6 +190,10 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
+        
+        /// <summary>
+        /// DM Chassis Video Output Names
+        /// </summary>
         [JoinName("OutputVideoNames")]
         public JoinDataComplete OutputVideoNames =
             new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 200 },
@@ -130,6 +203,10 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
+        
+        /// <summary>
+        /// DM Chassis Audio Output Names
+        /// </summary>
         [JoinName("OutputAudioNames")]
         public JoinDataComplete OutputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 200 },
@@ -139,15 +216,24 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
-
+        
+        /// <summary>
+        /// DM Chassis Video Output Currently Routed Video Input Name
+        /// </summary>
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis Audio Output Currently Routed Audio Input Name
+        /// </summary>
         [JoinName("OutputCurrentAudioInputNames")]
         public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis Input Current Resolution
+        /// </summary>
         [JoinName("InputCurrentResolution")]
         public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -7,66 +7,114 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// DM RMC Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM RMC Mute Video
+        /// </summary>
         [JoinName("VideoMuteOn")]
         public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM RMC UnMute Video
+        /// </summary>
         [JoinName("VideoMuteOff")]
         public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM RMC Mute Video Toggle
+        /// </summary>
         [JoinName("VideoMuteToggle")]
         public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM RMC Current Output Resolution
+        /// </summary>
         [JoinName("CurrentOutputResolution")]
         public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM RMC EDID Manufacturer
+        /// </summary>
         [JoinName("EdidManufacturer")]
         public JoinDataComplete EdidManufacturer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Manufacturer", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM RMC EDID Name
+        /// </summary>
         [JoinName("EdidName")]
         public JoinDataComplete EdidName = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM RMC EDID Preferred Timing
+        /// </summary>
         [JoinName("EdidPrefferedTiming")]
         public JoinDataComplete EdidPrefferedTiming = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Preferred Timing", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM RMC EDID Serial Number
+        /// </summary>
         [JoinName("EdidSerialNumber")]
         public JoinDataComplete EdidSerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM RMC Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM RMC Audio Video Source Set / Get
+        /// </summary>
         [JoinName("AudioVideoSource")]
         public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM RMC HDCP Support Capability
+        /// </summary>
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM RMC Port 1 (DM) HDCP State Set / Get
+        /// </summary>
         [JoinName("Port1HdcpState")]
         public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Port 1 (DM) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM RMC Port 2 (HDMI) HDCP State Set / Get
+        /// </summary>
         [JoinName("Port2HdcpState")]
         public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+            new JoinMetadata { Description = "DM RMC Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+        
+        /// <summary>
+        /// DM RMC HDMI Input Sync
+        /// </summary>
         [JoinName("HdmiInputSync")]
         public JoinDataComplete HdmiInputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC HDMI Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM RMC Number of Input Ports that support HDCP
+        /// </summary>
         [JoinName("HdcpInputPortCount")]
         public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -7,70 +7,121 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class DmTxControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// DM TX Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM TX Video Sync
+        /// </summary>
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM TX Enable Free Run Set / Get
+        /// </summary>
         [JoinName("FreeRunEnabled")]
         public JoinDataComplete FreeRunEnabled = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Enable Free Run Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Input 1 Video Sync Status
+        /// </summary>
         [JoinName("Input1VideoSyncStatus")]
         public JoinDataComplete Input1VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Input 1 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Input 2 Video Sync Status
+        /// </summary>
         [JoinName("Input2VideoSyncStatus")]
         public JoinDataComplete Input2VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Input 2 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Input 3 Video Sync Status
+        /// </summary>
         [JoinName("Input3VideoSyncStatus")]
         public JoinDataComplete Input3VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Input 3 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM TX Current Input Resolution
+        /// </summary>
         [JoinName("CurrentInputResolution")]
         public JoinDataComplete CurrentInputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Current Input Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM TX Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM TX Video Input Set / Get
+        /// </summary>
         [JoinName("VideoInput")]
         public JoinDataComplete VideoInput = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Video Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX Audio Input Set / Get
+        /// </summary>
         [JoinName("AudioInput")]
         public JoinDataComplete AudioInput = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Audio Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX HDCP Support Capability
+        /// </summary>
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX Port 1 HDCP State Set / Get
+        /// </summary>
         [JoinName("Port1HdcpState")]
         public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Port 1 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX Port 2 HDCP State Set / Get
+        /// </summary>
         [JoinName("Port2HdcpState")]
         public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Port 2 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX VGA Brightness
+        /// </summary>
         [JoinName("VgaBrightness")]
         public JoinDataComplete VgaBrightness = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX VGA Brightness", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX VGA Contrast
+        /// </summary>
         [JoinName("VgaContrast")]
         public JoinDataComplete VgaContrast = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX Port 3 HDCP State Set / Get
+        /// </summary>
         [JoinName("Port3HdcpState")]
         public JoinDataComplete Port3HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Port 3 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM TX Number of Input Ports that support HDCP
+        /// </summary>
         [JoinName("HdcpInputPortCount")]
         public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -8,150 +8,261 @@ namespace PepperDash.Essentials.Core.Bridges
     public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
     {
 
+        /// <summary>
+        /// Master Volume Level Signed dB Set / Get
+        /// </summary>
         [JoinName("MasterVolumeLevel")]
         public JoinDataComplete MasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Master Volume 16bit Scaled Set / Get
+        /// </summary>
         [JoinName("MasterVolumeLevelScaled")]
         public JoinDataComplete MasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Mixer Preset Recall Set
+        /// </summary>
         [JoinName("MixerPresetRecall")]
         public JoinDataComplete MixerPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Mixer Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Mixer Eq Preset Recall Set
+        /// </summary>
         [JoinName("MixerEqPresetRecall")]
         public JoinDataComplete MixerEqPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Mixer Eq Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Master Volume Mute On Set / Get
+        /// </summary>
         [JoinName("MasterVolumeMuteOn")]
         public JoinDataComplete MasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Master Volume Mute Off Set / Get
+        /// </summary>
         [JoinName("MasterVolumeMuteOff")]
         public JoinDataComplete MasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Master Volume Level Up
+        /// </summary>
         [JoinName("MasterVolumeUp")]
         public JoinDataComplete MasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Master Volume Level Down
+        /// </summary>
         [JoinName("MasterVolumeDown")]
         public JoinDataComplete MasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Master Volume Scaled Send Enable/Disable
+        /// </summary>
         [JoinName("MasterVolumeLevelScaledSend")]
         public JoinDataComplete MasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Source Volume Signed dB Set / Get
+        /// </summary>
         [JoinName("SourceVolumeLevel")]
         public JoinDataComplete SourceVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Source Volume 16bit Scaled Set / Get
+        /// </summary>
         [JoinName("SourceVolumeLevelScaled")]
         public JoinDataComplete SourceVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Source Volume Mute On Set / Get
+        /// </summary>
         [JoinName("SourceVolumeMuteOn")]
         public JoinDataComplete SourceVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Source Volume Mute Off Set / Get
+        /// </summary>
         [JoinName("SourceVolumeMuteOff")]
         public JoinDataComplete SourceVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Source Volume Level Up
+        /// </summary>
         [JoinName("SourceVolumeUp")]
         public JoinDataComplete SourceVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Source Volume Level Down
+        /// </summary>
         [JoinName("SourceVolumeDown")]
         public JoinDataComplete SourceVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Source Volume Scaled Send Enable/Disable
+        /// </summary>
         [JoinName("SourceVolumeLevelScaledSend")]
         public JoinDataComplete SourceVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec1 Volume Signed dB Set / Get
+        /// </summary>
         [JoinName("Codec1VolumeLevel")]
         public JoinDataComplete Codec1VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Codec1 Volume 16bit Scaled Set / Get
+        /// </summary>
         [JoinName("Codec1VolumeLevelScaled")]
         public JoinDataComplete Codec1VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Codec1 Volume Mute On Set / Get
+        /// </summary>
         [JoinName("Codec1VolumeMuteOn")]
         public JoinDataComplete Codec1VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec1 Volume Mute Off Set / Get
+        /// </summary>
         [JoinName("Codec1VolumeMuteOff")]
         public JoinDataComplete Codec1VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec1 Volume Level Up
+        /// </summary>
         [JoinName("Codec1VolumeUp")]
         public JoinDataComplete Codec1VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec1 Volume Level Down
+        /// </summary>
         [JoinName("Codec1VolumeDown")]
         public JoinDataComplete Codec1VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec1 Volume Scaled Send Enable/Disable
+        /// </summary>
         [JoinName("Codec1VolumeLevelScaledSend")]
         public JoinDataComplete Codec1VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec2 Volume Signed dB Set / Get
+        /// </summary>
         [JoinName("Codec2VolumeLevel")]
         public JoinDataComplete Codec2VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Codec2 Volume 16bit Scaled Set / Get
+        /// </summary>
         [JoinName("Codec2VolumeLevelScaled")]
         public JoinDataComplete Codec2VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Codec2 Volume Mute On Set / Get
+        /// </summary>
         [JoinName("Codec2VolumeMuteOn")]
         public JoinDataComplete Codec2VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec2 Volume Mute Off Set / Get
+        /// </summary>
         [JoinName("Codec2VolumeMuteOff")]
         public JoinDataComplete Codec2VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec2 Volume Level Up
+        /// </summary>
         [JoinName("Codec2VolumeUp")]
         public JoinDataComplete Codec2VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec2 Volume Level Down
+        /// </summary>
         [JoinName("Codec2VolumeDown")]
         public JoinDataComplete Codec2VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Codec2 Volume Scaled Send Enable/Disable
+        /// </summary>
         [JoinName("Codec2VolumeLevelScaledSend")]
         public JoinDataComplete Codec2VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// MicsMaster Volume Signed dB Set / Get
+        /// </summary>
         [JoinName("MicsMasterVolumeLevel")]
         public JoinDataComplete MicsMasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// MicsMaster Volume 16bit Scaled Set / Get
+        /// </summary>
         [JoinName("MicsMasterVolumeLevelScaled")]
         public JoinDataComplete MicsMasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// MicsMaster Volume Mute On Set / Get
+        /// </summary>
         [JoinName("MicsMasterVolumeMuteOn")]
         public JoinDataComplete MicsMasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// MicsMaster Volume Mute Off Set / Get
+        /// </summary>
         [JoinName("MicsMasterVolumeMuteOff")]
         public JoinDataComplete MicsMasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// MicsMaster Volume Level Up
+        /// </summary>
         [JoinName("MicsMasterVolumeUp")]
         public JoinDataComplete MicsMasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// MicsMaster Volume Level Down
+        /// </summary>
         [JoinName("MicsMasterVolumeDown")]
         public JoinDataComplete MicsMasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// MicsMaster Volume Scaled Send Enable/Disable
+        /// </summary>
         [JoinName("MicsMasterVolumeLevelScaledSend")]
         public JoinDataComplete MicsMasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
             new JoinMetadata { Description = "Mics Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs

@@ -7,26 +7,45 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
     {
+
+        /// <summary>
+        /// Mic Gain dB Set / Get
+        /// </summary>
         [JoinName("MicGain")]
         public JoinDataComplete MicGain = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Gain dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Mic Gain 16bit Scaled Set / Get
+        /// </summary>
         [JoinName("MicGainScaled")]
         public JoinDataComplete MicGainScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Gain 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Mic Mute On Set / Get
+        /// </summary>
         [JoinName("MicMuteOn")]
         public JoinDataComplete MicMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Mic Mute Off Set / Get
+        /// </summary>
         [JoinName("MicMuteOff")]
         public JoinDataComplete MicMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Mic Gain Scaled Send Enable/Disable
+        /// </summary>
         [JoinName("MicGainScaledSend")]
         public JoinDataComplete MicGainScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Gain Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Mic Name Get
+        /// </summary>
         [JoinName("MicName")]
         public JoinDataComplete MicName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Name Get", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -7,64 +7,106 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// DMPS Enable Audio and Video Routing
+        /// </summary>
         [JoinName("EnableRouting")]
         public JoinDataComplete EnableRouting = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS Enable Audio and Video Routing", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DMPS Disable Audio and Video Routing
+        /// </summary>
         [JoinName("SystemPowerOn")]
         public JoinDataComplete SystemPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS System Power On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DMPS Disable Audio and Video Routing
+        /// </summary>
         [JoinName("SystemPowerOff")]
         public JoinDataComplete SystemPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS System Power Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DMPS Front Panel Lock On Get/Set
+        /// </summary>
         [JoinName("FrontPanelLockOn")]
         public JoinDataComplete FrontPanelLockOn = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS Front Panel Lock On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DMPS Front Panel Lock  Off Get/Set
+        /// </summary>
         [JoinName("FrontPanelLockOff")]
         public JoinDataComplete FrontPanelLockOff = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS Front Panel Lock  Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Input Video Sync
+        /// </summary>
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Input Endpoint Online
+        /// </summary>
         [JoinName("InputEndpointOnline")]
         public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Output Endpoint Online
+        /// </summary>
         [JoinName("OutputEndpointOnline")]
         public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// DM Chassis Input Video Set / Get
+        /// </summary>
         [JoinName("OutputVideo")]
         public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Input Audio Set / Get
+        /// </summary>
         [JoinName("OutputAudio")]
         public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// DM Chassis Input Name
+        /// </summary>
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis Output Name
+        /// </summary>
         [JoinName("OutputNames")]
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+        
+        /// <summary>
+        /// DM Chassis Video Input Name
+        /// </summary>
         [JoinName("InputVideoNames")]
         public JoinDataComplete InputVideoNames =
             new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata
             {
-                Description = "Video Input Name",
+                Description = "DM Chassis Video Input Name",
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
-
+       
+        /// <summary>
+        /// DM Chassis Audio Input Name
+        /// </summary>
         [JoinName("InputAudioNames")]
         public JoinDataComplete InputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
@@ -74,6 +116,10 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
+       
+        /// <summary>
+        /// DM Chassis Video Output Name
+        /// </summary>
         [JoinName("OutputVideoNames")]
         public JoinDataComplete OutputVideoNames =
             new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 32 },
@@ -83,6 +129,10 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
+       
+        /// <summary>
+        /// DM Chassis Audio Output Name
+        /// </summary>    
         [JoinName("OutputAudioNames")]
         public JoinDataComplete OutputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 32 },
@@ -92,15 +142,24 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
-
+       
+        /// <summary>
+        /// DM Chassis Video Output Currently Routed Video Input Name
+        /// </summary>
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+       
+        /// <summary>
+        /// DM Chassis Audio Output Currently Routed Video Input Name
+        /// </summary>
         [JoinName("OutputCurrentAudioInputNames")]
         public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
+       
+        /// <summary>
+        /// DM Chassis Input Current Resolution
+        /// </summary>
         [JoinName("InputCurrentResolution")]
         public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs

@@ -2,8 +2,14 @@
 
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
+		/// <summary>
+		/// Represents a GenericIrControllerJoinMap
+		/// </summary>
 		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
 		{
+			/// <summary>
+			/// PLAY
+			/// </summary>
 			[JoinName("PLAY")]
 			public JoinDataComplete Play = new JoinDataComplete(
 				new JoinData
@@ -17,7 +23,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// STOP
+			/// </summary>
 			[JoinName("STOP")]
 			public JoinDataComplete Stop = new JoinDataComplete(
 				new JoinData
@@ -31,7 +40,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// PAUSE
+			/// </summary>
 			[JoinName("PAUSE")]
 			public JoinDataComplete Pause = new JoinDataComplete(
 				new JoinData
@@ -46,6 +58,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
+			/// <summary>
+			/// FSCAN
+			/// </summary>
 			[JoinName("FSCAN")]
 			public JoinDataComplete ForwardScan = new JoinDataComplete(
 				new JoinData
@@ -60,6 +75,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// RSCAN
+			/// </summary>
 			[JoinName("RSCAN")]
 			public JoinDataComplete ReverseScan = new JoinDataComplete(
 				new JoinData
@@ -73,7 +91,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// F_SKIP
+			/// </summary>
 			[JoinName("F_SKIP")]
 			public JoinDataComplete ForwardSkip = new JoinDataComplete(
 				new JoinData
@@ -88,6 +109,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// R_SKIP
+			/// </summary>
 			[JoinName("R_SKIP")]
 			public JoinDataComplete ReverseSkip = new JoinDataComplete(
 				new JoinData
@@ -101,7 +125,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// RECORD
+			/// </summary>
 			[JoinName("RECORD")]
 			public JoinDataComplete Record = new JoinDataComplete(
 				new JoinData
@@ -116,6 +143,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// POWER
+			/// </summary>
 			[JoinName("POWER")]
 			public JoinDataComplete Power = new JoinDataComplete(
 				new JoinData
@@ -130,6 +160,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// 0
+			/// </summary>
 			[JoinName("0")]
 			public JoinDataComplete Kp0 = new JoinDataComplete(
 				new JoinData
@@ -143,7 +176,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 1
+			/// </summary>
 			[JoinName("1")]
 			public JoinDataComplete Kp1 = new JoinDataComplete(
 				new JoinData
@@ -157,7 +193,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 2
+			/// </summary>
 			[JoinName("2")]
 			public JoinDataComplete Kp2 = new JoinDataComplete(
 				new JoinData
@@ -171,7 +210,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 3
+			/// </summary>
 			[JoinName("3")]
 			public JoinDataComplete Kp3 = new JoinDataComplete(
 				new JoinData
@@ -185,7 +227,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 4
+			/// </summary>
 			[JoinName("4")]
 			public JoinDataComplete Kp4 = new JoinDataComplete(
 				new JoinData
@@ -199,7 +244,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 5
+			/// </summary>
 			[JoinName("5")]
 			public JoinDataComplete Kp5 = new JoinDataComplete(
 				new JoinData
@@ -213,7 +261,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 6
+			/// </summary>
 			[JoinName("6")]
 			public JoinDataComplete Kp6 = new JoinDataComplete(
 				new JoinData
@@ -227,7 +278,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 7
+			/// </summary>
 			[JoinName("7")]
 			public JoinDataComplete Kp7 = new JoinDataComplete(
 				new JoinData
@@ -241,7 +295,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 8
+			/// </summary>
 			[JoinName("8")]
 			public JoinDataComplete Kp8 = new JoinDataComplete(
 				new JoinData
@@ -255,7 +312,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// 9
+			/// </summary>
 			[JoinName("9")]
 			public JoinDataComplete Kp9 = new JoinDataComplete(
 				new JoinData
@@ -283,7 +343,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
 			// 		JoinType = eJoinType.Digital
 			// 	});
-			
+
+			/// <summary>
+			/// ENTER
+			/// </summary>
 			[JoinName("ENTER")]
 			public JoinDataComplete Enter = new JoinDataComplete(
 				new JoinData
@@ -297,7 +360,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// CH+
+			/// </summary>
 			[JoinName("CH+")]
 			public JoinDataComplete ChannelUp = new JoinDataComplete(
 				new JoinData
@@ -311,7 +377,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// CH-
+			/// </summary>
 			[JoinName("CH-")]
 			public JoinDataComplete ChannelDown = new JoinDataComplete(
 				new JoinData
@@ -325,7 +394,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
+
+			/// <summary>
+			/// *
+			/// </summary>
 			[JoinName("*")]
 			public JoinDataComplete KpStar = new JoinDataComplete(
 				new JoinData
@@ -339,7 +411,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// #
+			/// </summary>
 			[JoinName("#")]
 			public JoinDataComplete KpPound = new JoinDataComplete(
 				new JoinData
@@ -368,6 +443,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			// 		JoinType = eJoinType.Digital
 			// 	});
 
+			/// <summary>
+			/// POWER_ON
+			/// </summary>
 			[JoinName("POWER_ON")]
 			public JoinDataComplete PowerOn = new JoinDataComplete(
 				new JoinData
@@ -381,7 +459,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// POWER_OFF
+			/// </summary>
 			[JoinName("POWER_OFF")]
 			public JoinDataComplete PowerOff = new JoinDataComplete(
 				new JoinData
@@ -395,7 +476,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// PLAY_PAUSE
+			/// </summary>
 			[JoinName("PLAY_PAUSE")]
 			public JoinDataComplete PlayPause = new JoinDataComplete(
 				new JoinData
@@ -409,7 +493,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// LAST
+			/// </summary>
 			[JoinName("LAST")]
 			public JoinDataComplete Last = new JoinDataComplete(
 				new JoinData
@@ -424,6 +511,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// HOME
+			/// </summary>
 			[JoinName("HOME")]
 			public JoinDataComplete Home = new JoinDataComplete(
 				new JoinData
@@ -438,6 +528,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// BACK
+			/// </summary>
 			[JoinName("BACK")]
 			public JoinDataComplete Back = new JoinDataComplete(
 				new JoinData
@@ -452,7 +545,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-
+			/// <summary>
+			/// GUIDE
+			/// </summary>
 			[JoinName("GUIDE")]
 			public JoinDataComplete Guide = new JoinDataComplete(
 				new JoinData
@@ -466,7 +561,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// INFO
+			/// </summary>
 			[JoinName("INFO")]
 			public JoinDataComplete Info = new JoinDataComplete(
 				new JoinData
@@ -480,7 +578,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// MENU
+			/// </summary>
 			[JoinName("MENU")]
 			public JoinDataComplete Menu = new JoinDataComplete(
 				new JoinData
@@ -494,7 +595,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// UP_ARROW
+			/// </summary>
 			[JoinName("UP_ARROW")]
 			public JoinDataComplete DpadUp = new JoinDataComplete(
 				new JoinData
@@ -508,7 +612,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// DN_ARROW
+			/// </summary>
 			[JoinName("DN_ARROW")]
 			public JoinDataComplete DpadDown = new JoinDataComplete(
 				new JoinData
@@ -522,7 +629,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// LEFT_ARROW
+			/// </summary>
 			[JoinName("LEFT_ARROW")]
 			public JoinDataComplete DpadLeft = new JoinDataComplete(
 				new JoinData
@@ -536,7 +646,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// RIGHT_ARROW
+			/// </summary>
 			[JoinName("RIGHT_ARROW")]
 			public JoinDataComplete DpadRight = new JoinDataComplete(
 				new JoinData
@@ -550,7 +663,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// SELECT
+			/// </summary>
 			[JoinName("SELECT")]
 			public JoinDataComplete DpadSelect = new JoinDataComplete(
 				new JoinData
@@ -564,7 +680,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// OPTIONS
+			/// </summary>
 			[JoinName("OPTIONS")]
 			public JoinDataComplete Options = new JoinDataComplete(
 				new JoinData
@@ -578,7 +697,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// RETURN
+			/// </summary>
 			[JoinName("RETURN")]
 			public JoinDataComplete Return = new JoinDataComplete(
 				new JoinData
@@ -593,6 +715,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// DVR
+			/// </summary>
 			[JoinName("DVR")]
 			public JoinDataComplete Dvr = new JoinDataComplete(
 				new JoinData
@@ -607,7 +732,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-
+			/// <summary>
+			/// ON_DEMAND
+			/// </summary>
 			[JoinName("ON_DEMAND")]
 			public JoinDataComplete OnDemand = new JoinDataComplete(
 				new JoinData
@@ -622,7 +749,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-
+			/// <summary>
+			/// PAGE_UP
+			/// </summary>
 			[JoinName("PAGE_UP")]
 			public JoinDataComplete PageUp = new JoinDataComplete(
 				new JoinData
@@ -636,7 +765,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// PAGE_DOWN
+			/// </summary>
 			[JoinName("PAGE_DOWN")]
 			public JoinDataComplete PageDown = new JoinDataComplete(
 				new JoinData
@@ -650,7 +782,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// F_SRCH
+			/// </summary>
 			[JoinName("F_SRCH")]
 			public JoinDataComplete ForwardSearch = new JoinDataComplete(
 				new JoinData
@@ -664,7 +799,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// R_SRCH
+			/// </summary>
 			[JoinName("R_SRCH")]
 			public JoinDataComplete ReverseSearch = new JoinDataComplete(
 				new JoinData
@@ -678,7 +816,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// TRACK+
+			/// </summary>
 			[JoinName("TRACK+")]
 			public JoinDataComplete TrackPlus = new JoinDataComplete(
 				new JoinData
@@ -692,7 +833,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// TRACK-
+			/// </summary>
 			[JoinName("TRACK-")]
 			public JoinDataComplete TrackMinus = new JoinDataComplete(
 				new JoinData
@@ -707,6 +851,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
+			/// <summary>
+			/// A
+			/// </summary>
 			[JoinName("A")]
 			public JoinDataComplete KpA = new JoinDataComplete(
 				new JoinData
@@ -720,7 +867,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// B
+			/// </summary>
 			[JoinName("B")]
 			public JoinDataComplete KpB = new JoinDataComplete(
 				new JoinData
@@ -734,7 +884,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// C
+			/// </summary>
 			[JoinName("C")]
 			public JoinDataComplete KpC = new JoinDataComplete(
 				new JoinData
@@ -748,7 +901,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// D
+			/// </summary>
 			[JoinName("D")]
 			public JoinDataComplete KpD = new JoinDataComplete(
 				new JoinData
@@ -762,7 +918,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// RED
+			/// </summary>
 			[JoinName("RED")]
 			public JoinDataComplete KpRed = new JoinDataComplete(
 				new JoinData
@@ -776,7 +935,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// GREEN
+			/// </summary>
 			[JoinName("GREEN")]
 			public JoinDataComplete KpGreen = new JoinDataComplete(
 				new JoinData
@@ -790,7 +952,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// YELLOW
+			/// </summary>
 			[JoinName("YELLOW")]
 			public JoinDataComplete KpYellow = new JoinDataComplete(
 				new JoinData
@@ -804,7 +969,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
+			
+			/// <summary>
+			/// BLUE
+			/// </summary>
 			[JoinName("BLUE")]
 			public JoinDataComplete KpBlue = new JoinDataComplete(
 				new JoinData
@@ -819,6 +987,10 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
+			/// <summary>
+			/// Constructor
+			/// </summary>
+			/// <param name="joinStart">Join this join map will start at</param>
 			public GenericIrControllerJoinMap(uint joinStart)
 				: base(joinStart, typeof(GenericIrControllerJoinMap))
 			{

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs

@@ -9,22 +9,37 @@ namespace PepperDash.Essentials.Core.Bridges
     public class GenericLightingJoinMap : JoinMapBaseAdvanced
     {
 
+        /// <summary>
+        /// Lighting Controller Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Lighting Controller Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Select Scene By Index
+        /// </summary>
         [JoinName("SelectScene")]
         public JoinDataComplete SelectScene = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Lighting Controller Select Scene By Index", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Select Scene Direct
+        /// </summary>
         [JoinName("SelectSceneDirect")]
         public JoinDataComplete SelectSceneDirect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 },
             new JoinMetadata { Description = "Lighting Controller Select Scene", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
-
+        
+        /// <summary>
+        /// Button Visibility
+        /// </summary>
         [JoinName("ButtonVisibility")]
         public JoinDataComplete ButtonVisibility = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 },
             new JoinMetadata { Description = "Lighting Controller Button Visibility", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Set Integration Id
+        /// </summary>
         [JoinName("IntegrationIdSet")]
         public JoinDataComplete IntegrationIdSet = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Lighting Controller Set Integration Id", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

@@ -8,6 +8,9 @@ namespace PepperDash.Essentials.Core.Bridges
     public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
     {
 
+        /// <summary>
+        /// Device Relay State Set / Get
+        /// </summary>
         [JoinName("Relay")]
         public JoinDataComplete Relay = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Relay State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -7,158 +7,275 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Occ Sensor Is Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Set to Occupied
+        /// </summary>
         [JoinName("ForceOccupied")]
         public JoinDataComplete ForceOccupied = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set to Occupied", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Set to Vacant
+        /// </summary>
         [JoinName("ForceVacant")]
         public JoinDataComplete ForceVacant = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set to Vacant", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Enable Raw
+        /// </summary>
         [JoinName("EnableRawStates")]
         public JoinDataComplete EnableRawStates = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Raw", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Disable Raw
+        /// </summary>
         [JoinName("RoomOccupiedFeedback")]
         public JoinDataComplete RoomOccupiedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Room Is Occupied", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Grace Occupancy Detected
+        /// </summary>
         [JoinName("GraceOccupancyDetectedFeedback")]
         public JoinDataComplete GraceOccupancyDetectedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Grace Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Room Is Vacant
+        /// </summary>
         [JoinName("RoomVacantFeedback")]
         public JoinDataComplete RoomVacantFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Room Is Vacant", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Raw Occupancy Detected
+        /// </summary>
         [JoinName("RawOccupancyFeedback")]
         public JoinDataComplete RawOccupancyFeedback = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Raw Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Raw PIR Occupancy Detected
+        /// </summary>
         [JoinName("RawOccupancyPirFeedback")]
         public JoinDataComplete RawOccupancyPirFeedback = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Raw PIR Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Raw US Occupancy Detected
+        /// </summary>
         [JoinName("RawOccupancyUsFeedback")]
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Raw US Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Enable LED Flash
+        /// </summary>
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable LED Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Disable LED Flash
+        /// </summary>
         [JoinName("DisableLedFlash")]
         public JoinDataComplete DisableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable LED Flash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Enable Short Timeout
+        /// </summary>
         [JoinName("EnableShortTimeout")]
         public JoinDataComplete EnableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Short Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Disable Short Timeout
+        /// </summary>
         [JoinName("DisableShortTimeout")]
         public JoinDataComplete DisableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable Short Timeout", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Set To Vacant when Either Sensor is Vacant
+        /// </summary>
         [JoinName("OrWhenVacated")]
         public JoinDataComplete OrWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set To Vacant when Either Sensor is Vacant", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Set To Vacant when Both Sensors are Vacant
+        /// </summary>
         [JoinName("AndWhenVacated")]
         public JoinDataComplete AndWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set To Vacant when Both Sensors are Vacant", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Enable Ultrasonic Sensor A
+        /// </summary>
         [JoinName("EnableUsA")]
         public JoinDataComplete EnableUsA = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Ultrasonic Sensor A", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Disable Ultrasonic Sensor A
+        /// </summary>
         [JoinName("DisableUsA")]
         public JoinDataComplete DisableUsA = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable Ultrasonic Sensor A", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Enable Ultrasonic Sensor B
+        /// </summary>
         [JoinName("EnableUsB")]
         public JoinDataComplete EnableUsB = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Ultrasonic Sensor B", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Disable Ultrasonic Sensor B
+        /// </summary>
         [JoinName("DisableUsB")]
         public JoinDataComplete DisableUsB = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable Ultrasonic Sensor B", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Enable IR Sensor
+        /// </summary>
         [JoinName("EnablePir")]
         public JoinDataComplete EnablePir = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable IR Sensor", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Disable IR Sensor
+        /// </summary>
         [JoinName("DisablePir")]
         public JoinDataComplete DisablePir = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable IR Sensor", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Increment US Occupied State Sensitivity
+        /// </summary>
         [JoinName("IncrementUsInOccupiedState")]
         public JoinDataComplete IncrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment US Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Decrement US Occupied State Sensitivity
+        /// </summary>
         [JoinName("DecrementUsInOccupiedState")]
         public JoinDataComplete DecrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement US Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Increment US Vacant State Sensitivity
+        /// </summary>
         [JoinName("IncrementUsInVacantState")]
         public JoinDataComplete IncrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment US Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Decrement US Vacant State Sensitivity
+        /// </summary>
         [JoinName("DecrementUsInVacantState")]
         public JoinDataComplete DecrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement US Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Increment IR Occupied State Sensitivity
+        /// </summary>
         [JoinName("IncrementPirInOccupiedState")]
         public JoinDataComplete IncrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment IR Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Decrement IR Occupied State Sensitivity
+        /// </summary>
         [JoinName("DecrementPirInOccupiedState")]
         public JoinDataComplete DecrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement IR Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Increment IR Vacant State Sensitivity
+        /// </summary>
         [JoinName("IncrementPirInVacantState")]
         public JoinDataComplete IncrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment IR Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Decrement IR Vacant State Sensitivity
+        /// </summary>
         [JoinName("DecrementPirInVacantState")]
         public JoinDataComplete DecrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement IR Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
+        
+        /// <summary>
+        /// Occ Sensor Timeout Value
+        /// </summary>
         [JoinName("Timeout")]
         public JoinDataComplete Timeout = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Timeout Value", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor Local Timeout Value
+        /// </summary>
         [JoinName("TimeoutLocalFeedback")]
         public JoinDataComplete TimeoutLocalFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Local Timeout Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor Internal PhotoSensor Value
+        /// </summary>
         [JoinName("InternalPhotoSensorValue")]
         public JoinDataComplete InternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Internal PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor External PhotoSensor Value
+        /// </summary>
         [JoinName("ExternalPhotoSensorValue")]
         public JoinDataComplete ExternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor External PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor Ultrasonic Sensitivity in Occupied State
+        /// </summary>
         [JoinName("UsSensitivityInOccupiedState")]
         public JoinDataComplete UsSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Ultrasonic Sensitivity in Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor Ultrasonic Sensitivity in Vacant State
+        /// </summary>
         [JoinName("UsSensitivityInVacantState")]
         public JoinDataComplete UsSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Ultrasonic Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor PIR Sensitivity in Occupied State
+        /// </summary>
         [JoinName("PirSensitivityInOccupiedState")]
         public JoinDataComplete PirSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor PIR Sensitivity in Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor PIR Sensitivity in Vacant State
+        /// </summary>
         [JoinName("PirSensitivityInVacantState")]
         public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor PIR Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        
+        /// <summary>
+        /// Occ Sensor Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs

@@ -11,6 +11,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
         #region Digital
 
+        /// <summary>
+        /// Sensor Is Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(
             new JoinData
@@ -25,7 +28,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        
+        /// <summary>
+        /// Sensor Enable
+        /// </summary>
         [JoinName("Enable")]
         public JoinDataComplete Enable = new JoinDataComplete(
             new JoinData
@@ -40,6 +45,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
+        /// <summary>
+        /// Sensor Partition Sensed
+        /// </summary>
         [JoinName("PartitionSensed")]
         public JoinDataComplete PartitionSensed = new JoinDataComplete(
             new JoinData
@@ -54,6 +62,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
+        /// <summary>
+        /// Sensor Partition Not Sensed
+        /// </summary>
         [JoinName("PartitionNotSensed")]
         public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
             new JoinData
@@ -68,6 +79,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
+        /// <summary>
+        /// Sensor Increase Sensitivity
+        /// </summary>
         [JoinName("IncreaseSensitivity")]
         public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
             new JoinData
@@ -82,6 +96,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
+        /// <summary>
+        /// Sensor Decrease Sensitivity
+        /// </summary>
         [JoinName("DecreaseSensitivity")]
         public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
             new JoinData
@@ -100,6 +117,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
         #region Analog
 
+        /// <summary>
+        /// Sensor Sensitivity
+        /// </summary>
         [JoinName("Sensitivity")]
         public JoinDataComplete Sensitivity = new JoinDataComplete(
             new JoinData
@@ -119,6 +139,9 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
         #region Serial
 
+        /// <summary>
+        /// Sensor Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(
             new JoinData

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs

@@ -7,42 +7,72 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Device Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Enable Automatic Routing on 4x1 Switchers
+        /// </summary>
         [JoinName("EnableAutoRoute")]
         public JoinDataComplete EnableAutoRoute = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Automatic Routing on 4x1 Switchers", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Device Input Name
+        /// </summary>
         [JoinName("InputName")]
         public JoinDataComplete InputName = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Device Input Sync
+        /// </summary>
         [JoinName("InputSync")]
         public JoinDataComplete InputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Device Output Name
+        /// </summary>
         [JoinName("OutputName")]
         public JoinDataComplete OutputName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 2 },
             new JoinMetadata { Description = "Device Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Device Output Route Set/Get
+        /// </summary>
         [JoinName("OutputRoute")]
         public JoinDataComplete OutputRoute = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 2 },
             new JoinMetadata { Description = "Device Output Route Set/Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Device Output Route Name
+        /// </summary>
         [JoinName("OutputRoutedName")]
         public JoinDataComplete OutputRoutedName = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 2 },
             new JoinMetadata { Description = "Device Output Route Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Device Enable Input Hdcp
+        /// </summary>
         [JoinName("EnableInputHdcp")]
         public JoinDataComplete EnableInputHdcp = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Enable Input Hdcp", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Device Disable Input Hdcp
+        /// </summary>
         [JoinName("DisableInputHdcp")]
         public JoinDataComplete DisableInputHdcp = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Disnable Input Hdcp", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Device Online Status
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Onlne", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs

@@ -8,50 +8,85 @@ namespace PepperDash.Essentials.Core.Bridges
     public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced
     {
 
+        /// <summary>
+        /// Device Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Remote End Detected
+        /// </summary>
         [JoinName("RemoteEndDetected")]
         public JoinDataComplete RemoteEndDetected = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Remote End Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Auto Route On
+        /// </summary>
         [JoinName("AutoRouteOn")]
         public JoinDataComplete AutoRouteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Auto Route On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Auto Route Off
+        /// </summary>
         [JoinName("AutoRouteOff")]
         public JoinDataComplete AutoRouteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Auto Route Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Priority Routing On
+        /// </summary>
         [JoinName("PriorityRoutingOn")]
         public JoinDataComplete PriorityRoutingOn = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Priority Routing On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Priority Routing Off
+        /// </summary>
         [JoinName("PriorityRoutingOff")]
         public JoinDataComplete PriorityRoutingOff = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Priority Routing Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Input On Screen Display Enabled
+        /// </summary>
         [JoinName("InputOnScreenDisplayEnabled")]
         public JoinDataComplete InputOnScreenDisplayEnabled = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Input OSD Enabled", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Input On Screen Display Disabled
+        /// </summary>
         [JoinName("InputOnScreenDisplayDisabled")]
         public JoinDataComplete InputOnScreenDisplayDisabled = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Input OSD Disabled", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Sync Detected
+        /// </summary>
         [JoinName("SyncDetected")]
         public JoinDataComplete SyncDetected = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Sync Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Video Source
+        /// </summary>
         [JoinName("VideoSource")]
         public JoinDataComplete VideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Source Count
+        /// </summary>
         [JoinName("SourceCount")]
         public JoinDataComplete SourceCount = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Video Source Count", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
+        /// <summary>
+        /// Source Names
+        /// </summary>
         [JoinName("SourceNames")]
         public JoinDataComplete SourceNames = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Video Source Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs

@@ -11,6 +11,9 @@ namespace PepperDash.Essentials.Core.Bridges
 
 		#region Digital
 
+		/// <summary>
+		/// Enable Automatic Routing on Xx1 Switchers
+		/// </summary>
 		[JoinName("EnableAutoRoute")]
 		public JoinDataComplete EnableAutoRoute = new JoinDataComplete(
 			new JoinData
@@ -25,7 +28,9 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-
+		/// <summary>
+		/// Device Input Sync
+		/// </summary>
 		[JoinName("InputSync")]
 		public JoinDataComplete InputSync = new JoinDataComplete(
 			new JoinData
@@ -40,7 +45,9 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-
+		/// <summary>
+		/// Device Enable Input Hdcp
+		/// </summary>
 		[JoinName("EnableInputHdcp")]
 		public JoinDataComplete EnableInputHdcp = new JoinDataComplete(
 			new JoinData
@@ -55,7 +62,9 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-
+		/// <summary>
+		/// Device Disnable Input Hdcp
+		/// </summary>
 		[JoinName("DisableInputHdcp")]
 		public JoinDataComplete DisableInputHdcp = new JoinDataComplete(
 			new JoinData
@@ -70,7 +79,9 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-
+		/// <summary>
+		/// Device Onlne
+		/// </summary>
 		[JoinName("IsOnline")]
 		public JoinDataComplete IsOnline = new JoinDataComplete(
 			new JoinData
@@ -90,6 +101,9 @@ namespace PepperDash.Essentials.Core.Bridges
 
 		#region Analog
 
+		/// <summary>
+		/// Device Input Route Set/Get
+		/// </summary>
 		[JoinName("OutputRoute")]
 		public JoinDataComplete OutputRoute = new JoinDataComplete(
 			new JoinData
@@ -109,6 +123,9 @@ namespace PepperDash.Essentials.Core.Bridges
 
 		#region Serial
 
+		/// <summary>
+		/// Device Name
+		/// </summary>
 		[JoinName("Name")]
 		public JoinDataComplete Name = new JoinDataComplete(
 			new JoinData
@@ -123,7 +140,9 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Serial
 			});
 
-
+		/// <summary>
+		/// Device Input Name
+		/// </summary>
 		[JoinName("InputName")]
 		public JoinDataComplete InputName = new JoinDataComplete(
 			new JoinData
@@ -138,7 +157,9 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Serial
 			});
 
-
+		/// <summary>
+		/// Device Output Name
+		/// </summary>
 		[JoinName("OutputName")]
 		public JoinDataComplete OutputName = new JoinDataComplete(
 			new JoinData
@@ -153,7 +174,9 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Serial
 			});
 
-
+		/// <summary>
+		/// Device Output Route Name
+		/// </summary>
 		[JoinName("OutputRoutedName")]
 		public JoinDataComplete OutputRoutedName = new JoinDataComplete(
 			new JoinData

src/PepperDash.Essentials.Core/Bridges/JoinMaps/Hrxxx0WirelessRemoteControllerJoinMap.cs

@@ -7,222 +7,387 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Power
+        /// </summary>
         [JoinName("Power")]
         public JoinDataComplete Power = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Power", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Menu
+        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Menu", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Guide
+        /// </summary>
         [JoinName("Guide")]
         public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Guide", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Info
+        /// </summary>
         [JoinName("Info")]
         public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Info", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// VolumeUp
+        /// </summary>
         [JoinName("VolumeUp")]
         public JoinDataComplete VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "VolumeUp", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// VolumeDown
+        /// </summary>
         [JoinName("VolumeDown")]
         public JoinDataComplete VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "VolumeDown", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// DialPadUp
+        /// </summary>
         [JoinName("DialPadUp")]
         public JoinDataComplete DialPadUp = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadUp", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// DialPadDown
+        /// </summary>
         [JoinName("DialPadDown")]
         public JoinDataComplete DialPadDown = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadDown", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// DialPadLeft
+        /// </summary>
         [JoinName("DialPadLeft")]
         public JoinDataComplete DialPadLeft = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadLeft", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// DialPadRight
+        /// </summary>
         [JoinName("DialPadRight")]
         public JoinDataComplete DialPadRight = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadRight", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// DialPadSelect
+        /// </summary>
         [JoinName("DialPadSelect")]
         public JoinDataComplete DialPadSelect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadSelect", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// ChannelUp
+        /// </summary>
         [JoinName("ChannelUp")]
         public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "ChannelUp", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// ChannelDown
+        /// </summary>
         [JoinName("ChannelDown")]
         public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "ChannelDown", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Mute
+        /// </summary>
         [JoinName("Mute")]
         public JoinDataComplete Mute = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Mute", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Exit
+        /// </summary>
         [JoinName("Exit")]
         public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Exit", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Last
+        /// </summary>
         [JoinName("Last")]
         public JoinDataComplete Last = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "Last", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Play
+        /// </summary>
         [JoinName("Play")]
         public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Play", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Pause
+        /// </summary>
         [JoinName("Pause")]
         public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Pause", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Rewind
+        /// </summary>
         [JoinName("Rewind")]
         public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Rewind", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// FastForward
+        /// </summary>
         [JoinName("FastForward")]
         public JoinDataComplete FastForward = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "FastForward", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// PreviousTrack
+        /// </summary>
         [JoinName("PreviousTrack")]
         public JoinDataComplete PreviousTrack = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "PreviousTrack", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// NextTrack
+        /// </summary>
         [JoinName("NextTrack")]
         public JoinDataComplete NextTrack = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "NextTrack", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Stop
+        /// </summary>
         [JoinName("Stop")]
         public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Stop", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Record
+        /// </summary>
         [JoinName("Record")]
         public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Record", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Dvr
+        /// </summary>
         [JoinName("Dvr")]
         public JoinDataComplete Dvr = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Dvr", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad1
+        /// </summary>
         [JoinName("Keypad1")]
         public JoinDataComplete Keypad1 = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad2Abc
+        /// </summary>
         [JoinName("Keypad2Abc")]
         public JoinDataComplete Keypad2 = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad2Abc", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad3Def
+        /// </summary>
         [JoinName("Keypad3Def")]
         public JoinDataComplete Keypad3Def = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad3Def", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad4Ghi
+        /// </summary>
         [JoinName("Keypad4Ghi")]
         public JoinDataComplete Keypad4Ghi = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad4Ghi", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad5Jkl
+        /// </summary>
         [JoinName("Keypad5Jkl")]
         public JoinDataComplete Keypad5Jkl = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad5Jkl", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad6Mno
+        /// </summary>
         [JoinName("Keypad6Mno")]
         public JoinDataComplete Keypad6Mno = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad6Mno", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad7Pqrs
+        /// </summary>
         [JoinName("Keypad7Pqrs")]
         public JoinDataComplete Keypad7Pqrs = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad7Pqrs", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad8Tuv
+        /// </summary>
         [JoinName("Keypad8Tuv")]
         public JoinDataComplete Keypad8Tuv = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad8Tuv", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad9Wxyz
+        /// </summary>
         [JoinName("Keypad9Wxyz")]
         public JoinDataComplete Keypad9Wxyz = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad9Wxyz", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad0
+        /// </summary>
         [JoinName("Keypad0")]
         public JoinDataComplete Keypad0 = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad0", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Clear
+        /// </summary>
         [JoinName("Clear")]
         public JoinDataComplete Clear = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
             new JoinMetadata { Description = "Clear", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Enter
+        /// </summary>
         [JoinName("Enter")]
         public JoinDataComplete Enter = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
             new JoinMetadata { Description = "Enter", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Red
+        /// </summary>
         [JoinName("Red")]
         public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
             new JoinMetadata { Description = "Red", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Green
+        /// </summary>
         [JoinName("Green")]
         public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
             new JoinMetadata { Description = "Green", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Yellow
+        /// </summary>
         [JoinName("Yellow")]
         public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
             new JoinMetadata { Description = "Yellow", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Blue
+        /// </summary>
         [JoinName("Blue")]
         public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "Blue", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom1
+        /// </summary>
         [JoinName("Custom1")]
         public JoinDataComplete Custom1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom2
+        /// </summary>
         [JoinName("Custom2")]
         public JoinDataComplete Custom2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom3
+        /// </summary>
         [JoinName("Custom3")]
         public JoinDataComplete Custom3 = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom3", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom4
+        /// </summary>
         [JoinName("Custom4")]
         public JoinDataComplete Custom4 = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom4", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom5
+        /// </summary>
         [JoinName("Custom5")]
         public JoinDataComplete Custom5 = new JoinDataComplete(new JoinData { JoinNumber = 46, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom5", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom6
+        /// </summary>
         [JoinName("Custom6")]
         public JoinDataComplete Custom6 = new JoinDataComplete(new JoinData { JoinNumber = 47, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom6", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom7
+        /// </summary>
         [JoinName("Custom7")]
         public JoinDataComplete Custom7 = new JoinDataComplete(new JoinData { JoinNumber = 48, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom7", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom8
+        /// </summary>
         [JoinName("Custom8")]
         public JoinDataComplete Custom8 = new JoinDataComplete(new JoinData { JoinNumber = 49, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom8", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Custom9
+        /// </summary>
         [JoinName("Custom9")]
         public JoinDataComplete Custom9 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom9", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Fav
+        /// </summary>
         [JoinName("Fav")]
         public JoinDataComplete Fav = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 },
             new JoinMetadata { Description = "Fav", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Home
+        /// </summary>
         [JoinName("Home")]
         public JoinDataComplete Home = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 },
             new JoinMetadata { Description = "Home", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// BatteryLow
+        /// </summary>
         [JoinName("BatteryLow")]
         public JoinDataComplete BatteryLow = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1 },
             new JoinMetadata { Description = "BatteryLow", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// BatteryCritical
+        /// </summary>
         [JoinName("BatteryCritical")]
         public JoinDataComplete BatteryCritical = new JoinDataComplete(new JoinData { JoinNumber = 54, JoinSpan = 1 },
             new JoinMetadata { Description = "BatteryCritical", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// BatteryVoltage
+        /// </summary>
         [JoinName("BatteryVoltage")]
         public JoinDataComplete BatteryVoltage = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "BatteryVoltage", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IAnalogInputJoinMap.cs

@@ -8,9 +8,16 @@ namespace PepperDash.Essentials.Core.Bridges
     public class IAnalogInputJoinMap : JoinMapBaseAdvanced
     {
 
+        /// <summary>
+        /// Input Value
+        /// </summary>
         [JoinName("InputValue")]
         public JoinDataComplete InputValue = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Input Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+        
+        /// <summary>
+        /// Minimum Change
+        /// </summary>
         [JoinName("MinimumChange")]
         public JoinDataComplete MinimumChange = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Minimum voltage change required to reflect a change", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs

@@ -7,26 +7,44 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Text Received From Remote Device
+        /// </summary>
         [JoinName("TextReceived")]
         public JoinDataComplete TextReceived = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Text Received From Remote Device", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Text Sent To Remote Device
+        /// </summary>
         [JoinName("SendText")]
         public JoinDataComplete SendText = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Text Sent To Remote Device", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Set Port Config
+        /// </summary>
         [JoinName("SetPortConfig")]
         public JoinDataComplete SetPortConfig = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Set Port Config", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Connect
+        /// </summary>
         [JoinName("Connect")]
         public JoinDataComplete Connect = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Connect", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Disconnect
+        /// </summary>
         [JoinName("Connected")]
         public JoinDataComplete Connected = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Status
+        /// </summary>
         [JoinName("Status")]
         public JoinDataComplete Status = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalInputJoinMap.cs

@@ -7,7 +7,9 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class IDigitalInputJoinMap : JoinMapBaseAdvanced
     {
-
+        /// <summary>
+        /// Input State
+        /// </summary>
         [JoinName("InputState")]
         public JoinDataComplete InputState = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Input State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalOutputJoinMap.cs

@@ -7,7 +7,9 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class IDigitalOutputJoinMap : JoinMapBaseAdvanced
     {
-
+        /// <summary>
+        /// Output State
+        /// </summary>
         [JoinName("OutputState")]
         public JoinDataComplete OutputState = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Get / Set state of Digital Input", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IRBlurayBaseJoinMap.cs

@@ -11,191 +11,331 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class IRBlurayBaseJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Power On
+        /// </summary>
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Power Off
+        /// </summary>
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Power Toggle
+        /// </summary>
         [JoinName("PowerToggle")]
         public JoinDataComplete PowerToggle = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Power Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Nav Up
+        /// </summary>
         [JoinName("Up")]
         public JoinDataComplete Up = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Nav Down
+        /// </summary>
         [JoinName("Down")]
         public JoinDataComplete Down = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Nav Left
+        /// </summary>
         [JoinName("Left")]
         public JoinDataComplete Left = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Nav Right
+        /// </summary>
         [JoinName("Right")]
         public JoinDataComplete Right = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Select
+        /// </summary>
         [JoinName("Select")]
         public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Menu
+        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Exit
+        /// </summary>
         [JoinName("Exit")]
         public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "Exit", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 0
+        /// </summary>
         [JoinName("Digit0")]
         public JoinDataComplete Digit0 = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 0", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 1
+        /// </summary>
         [JoinName("Digit1")]
         public JoinDataComplete Digit1 = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 1", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 2
+        /// </summary>
         [JoinName("Digit2")]
         public JoinDataComplete Digit2 = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 2", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 3
+        /// </summary>
         [JoinName("Digit3")]
         public JoinDataComplete Digit3 = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 3", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 4
+        /// </summary>
         [JoinName("Digit4")]
         public JoinDataComplete Digit4 = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 4", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 5
+        /// </summary>
         [JoinName("Digit5")]
         public JoinDataComplete Digit5 = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 5", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 6
+        /// </summary>
         [JoinName("Digit6")]
         public JoinDataComplete Digit6 = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 6", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 7
+        /// </summary>
         [JoinName("Digit7")]
         public JoinDataComplete Digit7 = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 7", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 8
+        /// </summary>
         [JoinName("Digit8")]
         public JoinDataComplete Digit8 = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 8", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Digit 9
+        /// </summary>
         [JoinName("Digit9")]
         public JoinDataComplete Digit9 = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 9", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad Clear
+        /// </summary>
         [JoinName("KeypadClear")]
         public JoinDataComplete KeypadClear = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Clear", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad Enter
+        /// </summary>
         [JoinName("KeypadEnter")]
         public JoinDataComplete KeypadEnter = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Enter", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Channel Up
+        /// </summary>
         [JoinName("ChannelUp")]
         public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Channel Down
+        /// </summary>
         [JoinName("ChannelDown")]
         public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Last Channel
+        /// </summary>
         [JoinName("LastChannel")]
         public JoinDataComplete LastChannel = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Last Channel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Guide
+        /// </summary>
         [JoinName("Guide")]
         public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Guide", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Info
+        /// </summary>
         [JoinName("Info")]
         public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Info", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Red
+        /// </summary>
         [JoinName("Red")]
         public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Red", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Green
+        /// </summary>
         [JoinName("Green")]
         public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Green", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Yellow
+        /// </summary>
         [JoinName("Yellow")]
         public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Yellow", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Blue
+        /// </summary>
         [JoinName("Blue")]
         public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Blue", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-
+        /// <summary>
+        /// Play
+        /// </summary>
         [JoinName("Play")]
         public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "Play", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Pause
+        /// </summary>
         [JoinName("Pause")]
         public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Stop
+        /// </summary>
         [JoinName("Stop")]
         public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "Stop", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Fast Forward
+        /// </summary>
         [JoinName("FFwd")]
         public JoinDataComplete FFwd = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
             new JoinMetadata { Description = "FFwd", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Rewind
+        /// </summary>
         [JoinName("Rewind")]
         public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
             new JoinMetadata { Description = "Rewind", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Chapter Plus
+        /// </summary>
         [JoinName("ChapPlus")]
         public JoinDataComplete ChapPlus = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
             new JoinMetadata { Description = "Chapter Plus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Chapter Minus
+        /// </summary>
         [JoinName("ChapMinus")]
         public JoinDataComplete ChapMinus = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
             new JoinMetadata { Description = "Chapter Minus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Replay
+        /// </summary>
         [JoinName("Replay")]
         public JoinDataComplete Replay = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
             new JoinMetadata { Description = "Replay", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Record
+        /// </summary>
         [JoinName("Record")]
         public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "Record", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Has Keypad Accessory Button 1
+        /// </summary>
         [JoinName("HasKeypadAccessoryButton1")]
         public JoinDataComplete HasKeypadAccessoryButton1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "Has Keypad Accessory Button 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Has Keypad Accessory Button 2
+        /// </summary>
         [JoinName("HasKeypadAccessoryButton2")]
         public JoinDataComplete HasKeypadAccessoryButton2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "Has Keypad Accessory Button 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad Accessory Button 1 Press
+        /// </summary>
         [JoinName("KeypadAccessoryButton1Press")]
         public JoinDataComplete KeypadAccessoryButton1Press = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 2 },
             new JoinMetadata { Description = "Keypad Accessory Button 1 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad Accessory Button 2 Press
+        /// </summary>
         [JoinName("KeypadAccessoryButton2Press")]
         public JoinDataComplete KeypadAccessoryButton2Press = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 2 },
             new JoinMetadata { Description = "Keypad Accessory Button 2 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Keypad Accessory Button 1 Label
+        /// </summary>
         [JoinName("KeypadAccessoryButton1Label")]
         public JoinDataComplete KeypadAccessoryButton1Label = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Keypad Accessory Button 2 Label
+        /// </summary>
         [JoinName("KeypadAccessoryButton2Label")]
         public JoinDataComplete KeypadAccessoryButton2Label = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/PduJoinMapBase.cs

@@ -7,34 +7,58 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class PduJoinMapBase : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// PDU Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// PDU Online Status
+        /// </summary>
         [JoinName("Online")]
         public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Number of Controlled Outlets
+        /// </summary>
         [JoinName("OutletCount")]
         public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Number of COntrolled Outlets", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Outlet Name
+        /// </summary>
         [JoinName("OutletName")]
         public JoinDataComplete OutletName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Outlet Enabled Status
+        /// </summary>
         [JoinName("OutletEnabled")]
         public JoinDataComplete OutletEnabled = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Enabled", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Outlet Power State
+        /// </summary>
         [JoinName("OutletPowerCycle")]
         public JoinDataComplete OutletPowerCycle = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Power Cycle", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Outlet Power On
+        /// </summary>
         [JoinName("OutletPowerOn")]
         public JoinDataComplete OutletPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
         
+        /// <summary>
+        /// Outlet Power Off
+        /// </summary>
         [JoinName("OutletPowerOff")]
         public JoinDataComplete OutletPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs

@@ -8,214 +8,373 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// STB Power On
+        /// </summary>
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Power Off
+        /// </summary>
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Power Toggle
+        /// </summary>
         [JoinName("PowerToggle")]
         public JoinDataComplete PowerToggle = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Has DPad
+        /// </summary>
         [JoinName("HasDpad")]
         public JoinDataComplete HasDpad = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has DPad", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Nav Up
+        /// </summary>
         [JoinName("Up")]
         public JoinDataComplete Up = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Nav Down
+        /// </summary>
         [JoinName("Down")]
         public JoinDataComplete Down = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Nav Left
+        /// </summary>
         [JoinName("Left")]
         public JoinDataComplete Left = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Nav Right
+        /// </summary>
         [JoinName("Right")]
         public JoinDataComplete Right = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Select
+        /// </summary>
         [JoinName("Select")]
         public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Menu
+        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Exit
+        /// </summary>
         [JoinName("Exit")]
         public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Exit", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Has Numeric
+        /// </summary>
         [JoinName("HasNumeric")]
         public JoinDataComplete HasNumeric = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has Numeric", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 0
+        /// </summary>
         [JoinName("Digit0")]
         public JoinDataComplete Digit0 = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 0", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 1
+        /// </summary>
         [JoinName("Digit1")]
         public JoinDataComplete Digit1 = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 1", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 2
+        /// </summary>
         [JoinName("Digit2")]
         public JoinDataComplete Digit2 = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 2", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 3
+        /// </summary>
         [JoinName("Digit3")]
         public JoinDataComplete Digit3 = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 3", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 4
+        /// </summary>
         [JoinName("Digit4")]
         public JoinDataComplete Digit4 = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 4", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 5
+        /// </summary>
         [JoinName("Digit5")]
         public JoinDataComplete Digit5 = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 5", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 6
+        /// </summary>
         [JoinName("Digit6")]
         public JoinDataComplete Digit6 = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 6", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 7
+        /// </summary>
         [JoinName("Digit7")]
         public JoinDataComplete Digit7 = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 7", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 8
+        /// </summary>
         [JoinName("Digit8")]
         public JoinDataComplete Digit8 = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 8", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Digit 9
+        /// </summary>
         [JoinName("Digit9")]
         public JoinDataComplete Digit9 = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 9", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Dash
+        /// </summary>
         [JoinName("Dash")]
         public JoinDataComplete Dash = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Dash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Keypad Enter
+        /// </summary>
         [JoinName("KeypadEnter")]
         public JoinDataComplete KeypadEnter = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Keypad Enter", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Channel Up
+        /// </summary>
         [JoinName("ChannelUp")]
         public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Channel Down
+        /// </summary>
         [JoinName("ChannelDown")]
         public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Last Channel
+        /// </summary>
         [JoinName("LastChannel")]
         public JoinDataComplete LastChannel = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Last Channel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Guide
+        /// </summary>
         [JoinName("Guide")]
         public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Guide", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Info
+        /// </summary>
         [JoinName("Info")]
         public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Info", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Red
+        /// </summary>
         [JoinName("Red")]
         public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Red", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Green
+        /// </summary>
         [JoinName("Green")]
         public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Green", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Yellow
+        /// </summary>
         [JoinName("Yellow")]
         public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Yellow", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Blue
+        /// </summary>
         [JoinName("Blue")]
         public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Blue", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Has DVR
+        /// </summary>
         [JoinName("HasDvr")]
         public JoinDataComplete HasDvr = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has DVR", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Dvr List
+        /// </summary>
         [JoinName("DvrList")]
         public JoinDataComplete DvrList = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "STB DvrList", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Play
+        /// </summary>
         [JoinName("Play")]
         public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Play", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Pause
+        /// </summary>
         [JoinName("Pause")]
         public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Stop
+        /// </summary>
         [JoinName("Stop")]
         public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Stop", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB FFwd
+        /// </summary>
         [JoinName("FFwd")]
         public JoinDataComplete FFwd = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
             new JoinMetadata { Description = "STB FFwd", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Rewind
+        /// </summary>
         [JoinName("Rewind")]
         public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Rewind", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Chapter Plus
+        /// </summary>
         [JoinName("ChapPlus")]
         public JoinDataComplete ChapPlus = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Chapter Plus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Chapter Minus
+        /// </summary>
         [JoinName("ChapMinus")]
         public JoinDataComplete ChapMinus = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Chapter Minus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Replay
+        /// </summary>
         [JoinName("Replay")]
         public JoinDataComplete Replay = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Replay", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Record
+        /// </summary>
         [JoinName("Record")]
         public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Record", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Has Keypad Accessory Button 1
+        /// </summary>
         [JoinName("HasKeypadAccessoryButton1")]
         public JoinDataComplete HasKeypadAccessoryButton1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has Keypad Accessory Button 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Has Keypad Accessory Button 2
+        /// </summary>
         [JoinName("HasKeypadAccessoryButton2")]
         public JoinDataComplete HasKeypadAccessoryButton2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has Keypad Accessory Button 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Keypad Accessory Button 1 Press
+        /// </summary>
         [JoinName("KeypadAccessoryButton1Press")]
         public JoinDataComplete KeypadAccessoryButton1Press = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 2 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 1 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Keypad Accessory Button 2 Press
+        /// </summary>
         [JoinName("KeypadAccessoryButton2Press")]
         public JoinDataComplete KeypadAccessoryButton2Press = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 2 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 2 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Keypad Accessory Button 1 Label
+        /// </summary>
         [JoinName("KeypadAccessoryButton1Label")]
         public JoinDataComplete KeypadAccessoryButton1Label = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// STB Keypad Accessory Button 2 Label
+        /// </summary>
         [JoinName("KeypadAccessoryButton2Label")]
         public JoinDataComplete KeypadAccessoryButton2Label = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// STB Load Presets
+        /// </summary>
         [JoinName("LoadPresets")]
         public JoinDataComplete LoadPresets = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Load Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// STB Has Presets
+        /// </summary>
         [JoinName("HasPresets")]
         public JoinDataComplete HasPresets = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Load Presets", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/StatusSignControllerJoinMap.cs

@@ -7,34 +7,58 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class StatusSignControllerJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Status Sign Online
+        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Sign Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Status Sign Name
+        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Sign Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Red LED Control
+        /// </summary>
         [JoinName("RedControl")]
         public JoinDataComplete RedControl = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Red LED Enable / Disable", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Red LED Intensity
+        /// </summary>
         [JoinName("RedLed")]
         public JoinDataComplete RedLed = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Red LED Intensity", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Green LED Control
+        /// </summary>
         [JoinName("GreenControl")]
         public JoinDataComplete GreenControl = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Green LED Enable / Disable", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Green LED Intensity
+        /// </summary>
         [JoinName("GreenLed")]
         public JoinDataComplete GreenLed = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Green LED Intensity", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Blue LED Control
+        /// </summary>
         [JoinName("BlueControl")]
         public JoinDataComplete BlueControl = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Blue LED Enable / Disable", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Blue LED Intensity
+        /// </summary>
         [JoinName("BlueLed")]
         public JoinDataComplete BlueLed = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Blue LED Intensity", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -7,146 +7,254 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class SystemMonitorJoinMap : JoinMapBaseAdvanced
     {
+        /// <summary>
+        /// Processor Timezone
+        /// </summary>
         [JoinName("TimeZone")]
         public JoinDataComplete TimeZone = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Timezone", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
+        /// <summary>
+        /// Processor Timezone Name
+        /// </summary>
         [JoinName("TimeZoneName")]
         public JoinDataComplete TimeZoneName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Timezone Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor OS Version
+        /// </summary>
         [JoinName("IOControllerVersion")]
         public JoinDataComplete IOControllerVersion = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor IO Controller Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor SNMP App Version
+        /// </summary>
         [JoinName("SnmpAppVersion")]
         public JoinDataComplete SnmpAppVersion = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor SNMP App Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor BACNet App Version
+        /// </summary>
         [JoinName("BACnetAppVersion")]
         public JoinDataComplete BACnetAppVersion = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor BACNet App Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Controller Version
+        /// </summary>
         [JoinName("ControllerVersion")]
         public JoinDataComplete ControllerVersion = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Controller Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Serial Number
+        /// </summary>
         [JoinName("SerialNumber")]
         public JoinDataComplete SerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Model
+        /// </summary>
         [JoinName("Model")]
         public JoinDataComplete Model = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Model", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Uptime
+        /// </summary>
         [JoinName("Uptime")]
         public JoinDataComplete Uptime = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Uptime", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Last Boot Time
+        /// </summary>
         [JoinName("LastBoot")]
         public JoinDataComplete LastBoot = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Last Boot", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Program Offset Join
+        /// </summary>
         [JoinName("ProgramOffsetJoin")]
         public JoinDataComplete ProgramOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 5 },
             new JoinMetadata { Description = "All Program Data is offset between slots by 5 - First Joins Start at 11", JoinCapabilities = eJoinCapabilities.None, JoinType = eJoinType.None });
 		
+        /// <summary>
+        /// Processor Program Start
+        /// </summary>
         [JoinName("ProgramStart")]
         public JoinDataComplete ProgramStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Start / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Processor Program Stop
+        /// </summary>
         [JoinName("ProgramStop")]
         public JoinDataComplete ProgramStop = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Stop / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Processor Program Register
+        /// </summary>
         [JoinName("ProgramRegister")]
         public JoinDataComplete ProgramRegister = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Register / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Processor Program Unregister
+        /// </summary>
         [JoinName("ProgramUnregister")]
         public JoinDataComplete ProgramUnregister = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program UnRegister / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Processor Program Name
+        /// </summary>
         [JoinName("ProgramName")]
         public JoinDataComplete ProgramName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Program Version
+        /// </summary>
         [JoinName("ProgramCompiledTime")]
         public JoinDataComplete ProgramCompiledTime = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Compile Time", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Program Crestron Database Version
+        /// </summary>
         [JoinName("ProgramCrestronDatabaseVersion")]
         public JoinDataComplete ProgramCrestronDatabaseVersion = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Database Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Program Environment Version
+        /// </summary>
         [JoinName("ProgramEnvironmentVersion")]
         public JoinDataComplete ProgramEnvironmentVersion = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Environment Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Program Aggregate Info
+        /// </summary>
         [JoinName("AggregatedProgramInfo")]
         public JoinDataComplete AggregatedProgramInfo = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Aggregate Info Json", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Ethernet Offset Join
+        /// </summary>
         [JoinName("EthernetOffsetJoin")]
         public JoinDataComplete EthernetOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "All Ethernet Data is offset between Nics by 5 - First Joins Start at 76", JoinCapabilities = eJoinCapabilities.None, JoinType = eJoinType.None });
 
+        /// <summary>
+        /// Processor Ethernet Hostname
+        /// </summary>
         [JoinName("HostName")]
         public JoinDataComplete HostName = new JoinDataComplete(new JoinData { JoinNumber = 76, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Hostname", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Current Ip Address
+        /// </summary>
         [JoinName("CurrentIpAddress")]
         public JoinDataComplete CurrentIpAddress = new JoinDataComplete(new JoinData { JoinNumber = 77, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Current Ip Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Current Subnet Mask
+        /// </summary>
         [JoinName("CurrentSubnetMask")]
         public JoinDataComplete CurrentSubnetMask = new JoinDataComplete(new JoinData { JoinNumber = 78, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Current Subnet Mask", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Current Default Gateway
+        /// </summary>
         [JoinName("CurrentDefaultGateway")]
         public JoinDataComplete CurrentDefaultGateway = new JoinDataComplete(new JoinData { JoinNumber = 79, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Current Default Gateway", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Static Ip Address
+        /// </summary>
         [JoinName("StaticIpAddress")]
         public JoinDataComplete StaticIpAddress = new JoinDataComplete(new JoinData { JoinNumber = 80, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Static Ip Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Static Subnet Mask
+        /// </summary>
         [JoinName("StaticSubnetMask")]
         public JoinDataComplete StaticSubnetMask = new JoinDataComplete(new JoinData { JoinNumber = 81, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Static Subnet Mask", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Static Default Gateway
+        /// </summary>
         [JoinName("StaticDefaultGateway")]
         public JoinDataComplete StaticDefaultGateway = new JoinDataComplete(new JoinData { JoinNumber = 82, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Static Default Gateway", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Domain
+        /// </summary>
         [JoinName("Domain")]
         public JoinDataComplete Domain = new JoinDataComplete(new JoinData { JoinNumber = 83, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Domain", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Dns Server
+        /// </summary>
         [JoinName("DnsServer")]
         public JoinDataComplete DnsServer = new JoinDataComplete(new JoinData { JoinNumber = 84, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Dns Server", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Mac Address
+        /// </summary>
         [JoinName("MacAddress")]
         public JoinDataComplete MacAddress = new JoinDataComplete(new JoinData { JoinNumber = 85, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Mac Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Ethernet Dhcp Status
+        /// </summary>
         [JoinName("DhcpStatus")]
         public JoinDataComplete DhcpStatus = new JoinDataComplete(new JoinData { JoinNumber = 86, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Dhcp Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        /// <summary>
+        /// Processor Reboot
+        /// </summary>
 		[JoinName("ProcessorRebot")]
 		public JoinDataComplete ProcessorReboot = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
 			new JoinMetadata { Description = "Reboot processor", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Is Appliance Fb
+        /// </summary>
 		[JoinName("IsAppliance")]
 		public JoinDataComplete IsAppliance = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
 			new JoinMetadata { Description = "Is appliance Fb", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Is Server Fb
+        /// </summary>
 		[JoinName("IsServer")]
 		public JoinDataComplete IsServer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
 			new JoinMetadata { Description = "Is server Fb", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        /// <summary>
+        /// Program Reset
+        /// </summary>
 		[JoinName("ProgramReset")]
 		public JoinDataComplete ProgramReset = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
 			new JoinMetadata { Description = "Resets the program", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

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

@@ -12,17 +12,24 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
- /// <summary>
- /// Represents a CecPortController
- /// </summary>
-	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
+    /// <summary>
+    /// Represents a CecPortController
+    /// </summary>
+    public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
     {
-  /// <summary>
-  /// Gets or sets the StreamDebugging
-  /// </summary>
-		public CommunicationStreamDebugging StreamDebugging { get; private set; }
+        /// <summary>
+        /// Gets or sets the StreamDebugging
+        /// </summary>
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
 
+        /// <summary>
+        /// Event raised when bytes are received
+        /// </summary>
         public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+        /// <summary>
+        /// Event raised when text is received
+        /// </summary>
         public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
         /// <summary>
@@ -32,19 +39,30 @@ namespace PepperDash.Essentials.Core
 
         ICec Port;
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="postActivationFunc">post activation function for the device</param>
+        /// <param name="config">configuration for the device</param>
         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;
-            });            
+            });
         }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="port">CEC port</param>
         public CecPortController(string key, ICec port)
             : base(key)
         {
@@ -58,27 +76,25 @@ 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);
-				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
+                this.PrintReceivedBytes(bytes);
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
-			if (textHandler != null)
-			{
-				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
-				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
-			}
+            if (textHandler != null)
+            {
+                this.PrintReceivedText(s);
+                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+            }
         }
 
         #region IBasicCommunication Members
@@ -90,8 +106,7 @@ namespace PepperDash.Essentials.Core
         {
             if (Port == null)
                 return;
-			if (StreamDebugging.TxStreamDebuggingIsEnabled)
-				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+            this.PrintSentText(text);
             Port.StreamCec.Send.StringValue = text;
         }
 
@@ -103,8 +118,8 @@ namespace PepperDash.Essentials.Core
             if (Port == null)
                 return;
             var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-			if (StreamDebugging.TxStreamDebuggingIsEnabled)
-				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+            this.PrintSentBytes(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,59 +1,78 @@
 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>
- /// Represents a ComPortController
- /// </summary>
+	/// <summary>
+	/// Represents a ComPortController
+	/// </summary>
 	public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
 	{
-        /// <summary>
-        /// Gets or sets the StreamDebugging
-        /// </summary>
-        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+		/// <summary>
+		/// Gets or sets the StreamDebugging
+		/// </summary>
+		public CommunicationStreamDebugging StreamDebugging { get; private set; }
 
+		/// <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>
-  /// Gets or sets the IsConnected
-  /// </summary>
+		/// <summary>
+		/// Gets or sets the IsConnected
+		/// </summary>
 		public bool IsConnected { get { return true; } }
 
 		ComPort Port;
 		ComPort.ComPortSpec Spec;
 
-	    public ComPortController(string key, Func<EssentialsControlPropertiesConfig, ComPort> postActivationFunc,
-	        ComPort.ComPortSpec spec, EssentialsControlPropertiesConfig config) : base(key)
-	    {
-            StreamDebugging = new CommunicationStreamDebugging(key);
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="postActivationFunc"></param>
+		/// <param name="spec"></param>
+		/// <param name="config"></param>
+		public ComPortController(string key, Func<EssentialsControlPropertiesConfig, ComPort> postActivationFunc,
+			ComPort.ComPortSpec spec, EssentialsControlPropertiesConfig config) : base(key)
+		{
+			StreamDebugging = new CommunicationStreamDebugging(key);
 
-	        Spec = spec;
+			Spec = spec;
 
-            AddPostActivationAction(() =>
-            {
-                Port = postActivationFunc(config);
+			AddPostActivationAction(() =>
+			{
+				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;
 			}
 
@@ -64,71 +83,77 @@ namespace PepperDash.Essentials.Core
 			RegisterAndConfigureComPort();
 		}
 
-	    private void RegisterAndConfigureComPort()
-	    {
-	        if (Port == null)
-	        {
-	            Debug.LogMessage(LogEventLevel.Information, this, "Configured com Port for this device does not exist.");
-	            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
-                }
-            }
+		private void RegisterAndConfigureComPort()
+		{
+			if (Port == null)
+			{
+				this.LogInformation($"Configured {Port.Parent.GetType().Name}-comport-{Port.ID} for {Key} does not exist.");
+				return;
+			}
 
-	        var specResult = Port.SetComPortSpec(Spec);
-	        if (specResult != 0)
-	        {
-	            Debug.LogMessage(LogEventLevel.Information, this, "WARNING: Cannot set comspec");
-	            return;
-	        }
-	        Port.SerialDataReceived += Port_SerialDataReceived;
-	    }
 
-	    ~ComPortController()
+			if (Port.Parent is CrestronControlSystem || Port.Parent is CenIoCom102)
+			{
+				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;
-            if (bytesHandler != null)
-            {
-                var bytes = Encoding.GetEncoding(28591).GetBytes(s);
-				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
-                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+			var bytesHandler = BytesReceived;
+			if (bytesHandler != null)
+			{
+				var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				this.PrintReceivedBytes(bytes);
+				bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
 				eventSubscribed = true;
-            }
-            var textHandler = TextReceived;
-            if (textHandler != null)
-            {
-				if (StreamDebugging.RxStreamDebuggingIsEnabled)
-					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
-                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			}
+			var textHandler = TextReceived;
+			if (textHandler != null)
+			{
+				this.PrintReceivedText(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>
-  /// Deactivate method
-  /// </summary>
-  /// <inheritdoc />
+		/// <summary>
+		/// Deactivate method
+		/// </summary>
+		/// <inheritdoc />
 		public override bool Deactivate()
 		{
 			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
@@ -136,70 +161,68 @@ namespace PepperDash.Essentials.Core
 
 		#region IBasicCommunication Members
 
-  /// <summary>
-  /// SendText method
-  /// </summary>
+		/// <summary>
+		/// SendText method
+		/// </summary>
 		public void SendText(string text)
 		{
 			if (Port == null)
 				return;
 
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
-            Port.Send(text);
+			this.PrintSentText(text);
+			Port.Send(text);
 		}
 
-  /// <summary>
-  /// SendBytes method
-  /// </summary>
+		/// <summary>
+		/// SendBytes method
+		/// </summary>
 		public void SendBytes(byte[] bytes)
 		{
 			if (Port == null)
 				return;
 			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+			this.PrintSentBytes(bytes);
 
 			Port.Send(text);
 		}
 
-  /// <summary>
-  /// Connect method
-  /// </summary>
+		/// <summary>
+		/// Connect method
+		/// </summary>
 		public void Connect()
-		{		
+		{
 		}
 
-  /// <summary>
-  /// Disconnect method
-  /// </summary>
+		/// <summary>
+		/// Disconnect method
+		/// </summary>
 		public void Disconnect()
 		{
 		}
 
 		#endregion
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="s"></param>
-        /// <summary>
-        /// SimulateReceive method
-        /// </summary>
-        public void SimulateReceive(string s)
-        {
-            // split out hex chars and build string
-            var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
-            StringBuilder b = new StringBuilder();
-            foreach (var t in split)
-            {
-                if (t.StartsWith(@"\") && t.Length == 4)
-                    b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
-                else
-                    b.Append(t);
-            }
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="s"></param>
+		/// <summary>
+		/// SimulateReceive method
+		/// </summary>
+		public void SimulateReceive(string s)
+		{
+			// split out hex chars and build string
+			var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
+			StringBuilder b = new StringBuilder();
+			foreach (var t in split)
+			{
+				if (t.StartsWith(@"\") && t.Length == 4)
+					b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
+				else
+					b.Append(t);
+			}
 
-            OnDataReceived(b.ToString());
-        }
+			OnDataReceived(b.ToString());
+		}
 	}
 }

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

@@ -21,6 +21,14 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public class ComSpecJsonConverter : JsonConverter
     {
+        /// <summary>
+        /// ReadJson method
+        /// </summary>
+        /// <param name="reader">reader to use</param>
+        /// <param name="objectType">type of the object being read</param>
+        /// <param name="existingValue">existing value of the object being read</param>
+        /// <param name="serializer">serializer to use</param>
+        /// <returns>deserialized object</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             if (objectType == typeof(ComPort.ComPortSpec?))
@@ -42,6 +50,9 @@ namespace PepperDash.Essentials.Core
             return objectType == typeof(ComPort.ComPortSpec?);
         }
 
+        /// <summary>
+        /// Gets or sets the CanRead
+        /// </summary>
         public override bool CanRead { get { return true; } }
 
         /// <summary>

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

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

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

@@ -20,6 +20,9 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public interface IComPortsDevice
 	{
+		/// <summary>
+		/// Gets the Device
+		/// </summary>
 		IComPorts Device { get; }
 	}
 }

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

@@ -39,6 +39,13 @@ namespace PepperDash.Essentials.Core
   /// </summary>
 		public bool ShowHexResponse { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the ConsoleCommMockDevice class.
+        /// </summary>
+        /// <param name="key">The key of the device.</param>
+        /// <param name="name">The name of the device.</param>
+        /// <param name="props">The properties configuration for the device.</param>
+        /// <param name="comm">The communication method for the device.</param>
 		public ConsoleCommMockDevice(string key, string name, ConsoleCommMockDevicePropertiesConfig props, IBasicCommunication comm)
 			:base(key, name)
 		{
@@ -72,20 +79,24 @@ namespace PepperDash.Essentials.Core
 		}
 	}
 
- /// <summary>
- /// Represents a ConsoleCommMockDevicePropertiesConfig
- /// </summary>
+    /// <summary>
+    /// Represents a ConsoleCommMockDevicePropertiesConfig
+    /// </summary>
 	public class ConsoleCommMockDevicePropertiesConfig
 	{
-  /// <summary>
-  /// Gets or sets the LineEnding
-  /// </summary>
+        /// <summary>
+        /// Gets or sets the LineEnding
+        /// </summary>
 		public string LineEnding { get; set; }
-  /// <summary>
-  /// Gets or sets the CommunicationMonitorProperties
-  /// </summary>
+
+        /// <summary>
+        /// Gets or sets the CommunicationMonitorProperties
+        /// </summary>
 		public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the ConsoleCommMockDevicePropertiesConfig class.
+        /// </summary>
 		public ConsoleCommMockDevicePropertiesConfig()
 		{
 			LineEnding = "\x0a";
@@ -97,6 +108,9 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public class ConsoleCommMockDeviceFactory : EssentialsDeviceFactory<ConsoleCommMockDevice>
     {
+        /// <summary>
+        /// Initializes a new instance of the ConsoleCommMockDeviceFactory class.
+        /// </summary>
         public ConsoleCommMockDeviceFactory()
         {
             TypeNames = new List<string>() { "commmock" };

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

@@ -23,8 +23,15 @@ namespace PepperDash.Essentials.Core
     {
         EssentialsControlPropertiesConfig PropertiesConfig;
 
+        /// <summary>
+        /// Gets the CommPort
+        /// </summary>
         public IBasicCommunication CommPort { get; private set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="config">the config of the device</param>
         public GenericComm(DeviceConfig config)
             : base(config)
         {
@@ -33,7 +40,7 @@ namespace PepperDash.Essentials.Core
 
             var commPort = CommFactory.CreateCommForDevice(config);
 
-            //Fixing decision to require '-comPorts' in delcaration for DGE in order to get a device with comports included
+            //Fixing decision to require '-comPorts' in declaration for DGE in order to get a device with comports included
             if (commPort == null)
             {
                 config.Key = config.Key + "-comPorts";
@@ -70,6 +77,10 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        /// <summary>
+        /// CustomSetConfig method
+        /// </summary>
+        /// <param name="config">the new device configuration</param>
         protected override void CustomSetConfig(DeviceConfig config)
         {
             PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
@@ -144,6 +155,9 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public class GenericCommFactory : EssentialsDeviceFactory<GenericComm>
     {
+        /// <summary>
+        /// Initializes a new instance of the GenericCommFactory class.
+        /// </summary>
         public GenericCommFactory()
         {
             TypeNames = new List<string>() { "genericComm" };

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

@@ -4,15 +4,26 @@ using System;
 
 namespace PepperDash.Essentials.Core
 {
+	
+	/// <summary>
+	/// Represents a GenericHttpClient
+	/// </summary>
     [Obsolete("Please use the builtin HttpClient class instead: https://learn.microsoft.com/en-us/dotnet/fundamentals/networking/http/httpclient-guidelines")]
- /// <summary>
- /// Represents a GenericHttpClient
- /// </summary>
 	public class GenericHttpClient : Device, IBasicCommunication
 	{
 		private readonly HttpClient Client;
+
+		/// <summary>
+		/// Event raised when response is received
+		/// </summary>
 		public event EventHandler<GenericHttpClientEventArgs> ResponseRecived;
 
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="key">key of the device</param>
+		/// <param name="name">name of the device</param>
+		/// <param name="hostname">hostname for the HTTP client</param>
 		public GenericHttpClient(string key, string name, string hostname)
 			: base(key, name)
 		{
@@ -25,12 +36,9 @@ namespace PepperDash.Essentials.Core
         }
 
 		/// <summary>
-		/// 
+		/// SendText method
 		/// </summary>
-		/// <param name="path"></param>
-  /// <summary>
-  /// SendText method
-  /// </summary>
+		/// <param name="path">the path to send the request to</param>
 		public void SendText(string path)
 		{
 			HttpClientRequest request = new HttpClientRequest();
@@ -38,6 +46,12 @@ namespace PepperDash.Essentials.Core
 			request.Url = new UrlParser(url);
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request); 
 		}
+
+		/// <summary>
+		/// SendText method
+		/// </summary>
+		/// <param name="format">format for the items</param>
+		/// <param name="items">items to format</param>
 		public void SendText(string format, params object[] items)
 		{
 			HttpClientRequest request = new HttpClientRequest();
@@ -46,9 +60,11 @@ namespace PepperDash.Essentials.Core
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request);
 		}
 
-  /// <summary>
-  /// SendTextNoResponse method
-  /// </summary>
+		/// <summary>
+		/// SendTextNoResponse method
+		/// </summary>
+		/// <param name="format">format for the items</param>
+		/// <param name="items">items to format</param>
 		public void SendTextNoResponse(string format, params object[] items)
 		{
 			HttpClientRequest request = new HttpClientRequest();
@@ -57,6 +73,12 @@ namespace PepperDash.Essentials.Core
 			Client.Dispatch(request);
 		}
 
+		/// <summary>
+		/// Response method
+		/// </summary>
+		/// <param name="response">response received from the HTTP client</param>
+		/// <param name="error">error status of the HTTP callback</param>
+		/// <param name="request">original HTTP client request</param>
 		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
 		{
 			if (error == HTTP_CALLBACK_ERROR.COMPLETED)
@@ -74,9 +96,10 @@ namespace PepperDash.Essentials.Core
 
 		#region IBasicCommunication Members
 
-  /// <summary>
-  /// SendBytes method
-  /// </summary>
+		/// <summary>
+		/// SendBytes method
+		/// </summary>
+		/// <param name="bytes">bytes to send</param>
 		public void SendBytes(byte[] bytes)
 		{
 			throw new NotImplementedException();
@@ -88,50 +111,69 @@ namespace PepperDash.Essentials.Core
 
 		#region ICommunicationReceiver Members
 
+		/// <summary>
+		/// BytesReceived event
+		/// </summary>
 		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
 
-  /// <summary>
-  /// Connect method
-  /// </summary>
+		/// <summary>
+		/// Connect method
+		/// </summary>
 		public void Connect()
 		{
 			throw new NotImplementedException();
 		}
 
-  /// <summary>
-  /// Disconnect method
-  /// </summary>
+		/// <summary>
+		/// Disconnect method
+		/// </summary>
 		public void Disconnect()
 		{
 			throw new NotImplementedException();
 		}
 
+		/// <summary>
+		/// IsConnected property
+		/// </summary>
 		public bool IsConnected
 		{
 			get { return true; }
 		}
 
+		/// <summary>
+		/// TextReceived event
+		/// </summary>
 		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
 		#endregion
 	}
- /// <summary>
- /// Represents a GenericHttpClientEventArgs
- /// </summary>
+
+	/// <summary>
+	/// Represents a GenericHttpClientEventArgs
+	/// </summary>
 	public class GenericHttpClientEventArgs : EventArgs
 	{
-  /// <summary>
-  /// Gets or sets the ResponseText
-  /// </summary>
+		/// <summary>
+		/// Gets or sets the ResponseText
+		/// </summary>
 		public string ResponseText { get; private set; }
-  /// <summary>
-  /// Gets or sets the RequestPath
-  /// </summary>
+
+		/// <summary>
+		/// Gets or sets the RequestPath
+		/// </summary>
 		public string RequestPath { get; private set; }
-  /// <summary>
-  /// Gets or sets the Error
-  /// </summary>
+
+		/// <summary>
+		/// Gets or sets the Error
+		/// </summary>
 		public HTTP_CALLBACK_ERROR Error { get; set; }
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="response">response text</param>
+		/// <param name="request">request path</param>
+		/// <param name="error">error status</param>
 		public GenericHttpClientEventArgs(string response, string request, HTTP_CALLBACK_ERROR error)
 		{
 			ResponseText = response;

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

@@ -15,10 +15,13 @@ using Serilog.Events;
 namespace PepperDash.Essentials.Core
 {
 	/// <summary>
-	/// 
+	/// Helper class for IR port operations
 	/// </summary>
 	public static class IRPortHelper
 	{
+		/// <summary>
+		/// Gets the IrDriverPathPrefix
+		/// </summary>
 		public static string IrDriverPathPrefix
 		{
 			get
@@ -31,7 +34,7 @@ namespace PepperDash.Essentials.Core
 		/// Finds either the ControlSystem or a device controller that contains IR ports and
 		/// returns a port from the hardware device
 		/// </summary>
-		/// <param name="propsToken"></param>
+		/// <param name="propsToken">JSON token containing properties</param>
 		/// <returns>IrPortConfig object.  The port and or filename will be empty/null 
 		/// if valid values don't exist on config</returns>
 		public static IrOutPortConfig GetIrPort(JToken propsToken)
@@ -83,9 +86,11 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-     /// <summary>
-     /// GetIrOutputPort method
-     /// </summary>
+		/// <summary>
+		/// GetIrOutputPort method
+		/// </summary>
+		/// <param name="dc">DeviceConfig to get the IR port for</param>
+		/// <returns>IROutputPort or null if not found</returns>
 	    public static IROutputPort GetIrOutputPort(DeviceConfig dc)
 	    {
 	        var irControllerKey = dc.Key + "-ir";
@@ -145,9 +150,11 @@ namespace PepperDash.Essentials.Core
 	        return port;
 	    }
 
-     /// <summary>
-     /// GetIrOutputPortController method
-     /// </summary>
+		/// <summary>
+		/// GetIrOutputPortController method
+		/// </summary>
+		/// <param name="config">DeviceConfig to create the IrOutputPortController for</param>
+		/// <returns>IrOutputPortController object</returns>
 	    public static IrOutputPortController GetIrOutputPortController(DeviceConfig config)
 	    {
             Debug.LogMessage(LogEventLevel.Debug, "Attempting to create new Ir Port Controller");
@@ -228,23 +235,32 @@ namespace PepperDash.Essentials.Core
         }*/
 	}
 
- /// <summary>
- /// Represents a IrOutPortConfig
- /// </summary>
+	/// <summary>
+	/// Represents a IrOutPortConfig
+	/// </summary>
 	public class IrOutPortConfig
 	{
+		/// <summary>
+		/// Gets or sets the Port
+		/// </summary>
 		[JsonProperty("port")]
-  /// <summary>
-  /// Gets or sets the Port
-  /// </summary>
-		public IROutputPort Port { get; set; }
-		
+  		public IROutputPort Port { get; set; }
+
+		/// <summary>
+		/// Gets or sets the FileName
+		/// </summary>		
 		[JsonProperty("fileName")]
 		public string FileName { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether to use bridge join map
+		/// </summary>
 		[JsonProperty("useBridgeJoinMap")]
 		public bool UseBridgeJoinMap { get; set; }
 
+		/// <summary>
+		/// Constructor
+		/// </summary>
 		public IrOutPortConfig()
 		{
 			FileName = "";			

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

@@ -13,9 +13,15 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class AudioControlPointListItem
     {
+        /// <summary>
+        /// Level controls for this audio control point
+        /// </summary>
         [JsonProperty("levelControls")]
         public Dictionary<string, LevelControlListItem> LevelControls { get; set; } = new Dictionary<string, LevelControlListItem>();
 
+        /// <summary>
+        /// Presets for this audio control point
+        /// </summary>
         [JsonProperty("presets")]
         public Dictionary<string, PresetListItem> Presets { get; set; } = new Dictionary<string, PresetListItem>();
 

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

@@ -0,0 +1,29 @@
+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/BasicConfig.cs

@@ -14,33 +14,57 @@ namespace PepperDash.Essentials.Core.Config
 	/// </summary>
 	public class BasicConfig
 	{
+        /// <summary>
+        /// Gets or sets the Info
+        /// </summary>
 		[JsonProperty("info")]
 		public InfoConfig Info { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Devices
+        /// </summary>
 		[JsonProperty("devices")]
 		public List<DeviceConfig> Devices { get; set; }
 
+        /// <summary>
+        /// Gets or sets the SourceLists
+        /// </summary>
 		[JsonProperty("sourceLists")]
 		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }
 
+        /// <summary>
+        /// Gets or sets the DestinationLists
+        /// </summary>
         [JsonProperty("destinationLists")]
         public Dictionary<string, Dictionary<string, DestinationListItem>> DestinationLists { get; set; }
 
+        /// <summary>
+        /// Gets or sets the AudioControlPointLists
+        /// </summary>
         [JsonProperty("audioControlPointLists")]
         public Dictionary<string, AudioControlPointListItem> AudioControlPointLists { get; set; }
 
+        /// <summary>
+        /// Gets or sets the CameraLists
+        /// </summary>
         [JsonProperty("cameraLists")]
         public Dictionary<string, Dictionary<string, CameraListItem>> CameraLists { get; set; }
 
+        /// <summary>
+        /// Gets or sets the TieLines
+        /// </summary>
         [JsonProperty("tieLines")]
-  /// <summary>
-  /// Gets or sets the TieLines
-  /// </summary>
-		public List<TieLineConfig> TieLines { get; set; }
+  		public List<TieLineConfig> TieLines { get; set; }
 
+        /// <summary>
+        /// Gets or sets the JoinMaps
+        /// </summary>
         [JsonProperty("joinMaps")]
         public Dictionary<string, JObject> JoinMaps { get; set; }
 
+        /// <summary>
+        /// BasicConfig Constructor
+        /// </summary>
         public BasicConfig()
         {
             Info = new InfoConfig();
@@ -98,6 +122,7 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Checks CameraLists for a given list and returns it if found. Otherwise, returns null
         /// </summary>
+        /// <param name="key">Key of desired camera list</param>
         public Dictionary<string, CameraListItem> GetCameraListForKey(string key)
         {
             if (CameraLists == null || string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key))
@@ -110,10 +135,6 @@ namespace PepperDash.Essentials.Core.Config
         /// Checks Devices for an item with a Key that matches and returns it if found. Otherwise, retunes null
         /// </summary>
         /// <param name="key">Key of desired device</param>
-        /// <returns></returns>
-        /// <summary>
-        /// GetDeviceForKey method
-        /// </summary>
         public DeviceConfig GetDeviceForKey(string key)
         {
             if (string.IsNullOrEmpty(key))

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

@@ -18,43 +18,47 @@ 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; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="dc">device config</param>
         public DeviceConfig(DeviceConfig dc)
         {
             Key = dc.Key;
@@ -68,7 +72,10 @@ namespace PepperDash.Essentials.Core.Config
             //Properties = JToken.FromObject(dc.Properties);
         }
 
-        public DeviceConfig() {}
+        /// <summary>
+        /// Default Constructor
+        /// </summary>
+        public DeviceConfig() { }
     }
 
     /// <summary>
@@ -85,6 +92,14 @@ namespace PepperDash.Essentials.Core.Config
             return objectType == typeof(JToken);
         }
 
+        /// <summary>
+        /// ReadJson method
+        /// </summary>
+        /// <param name="reader">reader to use</param>
+        /// <param name="objectType">type of object being read</param>
+        /// <param name="existingValue">existing value for the object</param>
+        /// <param name="serializer">serializer to use</param>
+        /// <returns></returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             return JToken.ReadFrom(reader);

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

@@ -18,17 +18,23 @@ namespace PepperDash.Essentials.Core.Config
 	/// </summary>
 	public class ConfigReader
 	{
+        /// <summary>
+        /// Local Config Present Message
+        /// </summary>
 	    public const string LocalConfigPresent =
             @"
 ***************************************************
 ************* Using Local config file *************
 ***************************************************";
 
+        /// <summary>
+        /// The loaded config object
+        /// </summary>
 		public static EssentialsConfig ConfigObject { get; private set; }
 
-  /// <summary>
-  /// LoadConfig2 method
-  /// </summary>
+        /// <summary>
+        /// LoadConfig2 method
+        /// </summary>
 		public static bool LoadConfig2()
 		{
 			Debug.LogMessage(LogEventLevel.Information, "Loading unmerged system/template portal configuration file.");
@@ -124,22 +130,35 @@ namespace PepperDash.Essentials.Core.Config
                         Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded Local Config");
 
                         return true;
-                    }
+                    }                   
                     else
                     {
-                        var doubleObj = JObject.Parse(fs.ReadToEnd());
-                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
+                        var parsedConfig = JObject.Parse(fs.ReadToEnd());
 
-                        // Extract SystemUrl and TemplateUrl into final config output
-
-                        if (doubleObj["system_url"] != null)
+                        // 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)
                         {
-                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
+                            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;
                         }
 
-                        if (doubleObj["template_url"] != null)
+                        // Extract SystemUrl and TemplateUrl into final config output
+                        ConfigObject = PortalConfigReader.MergeConfigs(parsedConfig).ToObject<EssentialsConfig>();
+
+                        if (parsedConfig["system_url"] != null)
                         {
-                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
+                            ConfigObject.SystemUrl = parsedConfig["system_url"].Value<string>();
+                        }
+
+                        if (parsedConfig["template_url"] != null)
+                        {
+                            ConfigObject.TemplateUrl = parsedConfig["template_url"].Value<string>();
                         }
                     }
 
@@ -158,11 +177,8 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Returns all the files from the directory specified.
         /// </summary>
-        /// <param name="filePath"></param>
-        /// <returns></returns>
-        /// <summary>
-        /// GetConfigFiles method
-        /// </summary>
+        /// <param name="filePath">path to the directory</param>
+        /// <returns>config files</returns>
         public static FileInfo[] GetConfigFiles(string filePath)
         {
             // Get the directory
@@ -193,11 +209,8 @@ namespace PepperDash.Essentials.Core.Config
 		/// <summary>
 		/// Returns the group for a given device key in config
 		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-        /// <summary>
-        /// GetGroupForDeviceKey method
-        /// </summary>
+		/// <param name="key">Key of the device</param>
+		/// <returns>Group name if the device is found, null otherwise</returns>
         public static string GetGroupForDeviceKey(string key)
         {
             var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));

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

@@ -16,13 +16,20 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Config
 {
+    /// <summary>
+    /// ConfigUpdater class
+    /// </summary>
     public static class ConfigUpdater
     {
+        /// <summary>
+        /// ConfigStatusChanged event
+        /// </summary>
         public static event EventHandler<ConfigStatusEventArgs> ConfigStatusChanged;
 
         /// <summary>
         /// GetConfigFromServer method
         /// </summary>
+        /// <param name="url">URL of the config server</param>
         public static void GetConfigFromServer(string url)
         {
             Debug.LogMessage(LogEventLevel.Information, "Attempting to get new config from '{0}'", url);
@@ -210,13 +217,44 @@ namespace PepperDash.Essentials.Core.Config
         /// </summary>
         public enum eUpdateStatus
     {
+        /// <summary>
+        /// UpdateStarted status
+        /// </summary>
         UpdateStarted,
+
+        /// <summary>
+        /// ConfigFileReceived status
+        /// </summary>
         ConfigFileReceived,
+
+        /// <summary>
+        /// ArchivingConfigs status
+        /// </summary>
         ArchivingConfigs,
+
+        /// <summary>
+        /// DeletingLocalConfig status
+        /// </summary>
         DeletingLocalConfig,
+
+        /// <summary>
+        /// WritingConfigFile status
+        /// </summary>
         WritingConfigFile,
+
+        /// <summary>
+        /// RestartingProgram status
+        /// </summary>
         RestartingProgram,
+
+        /// <summary>
+        /// UpdateSucceeded status
+        /// </summary>
         UpdateSucceeded,
+
+        /// <summary>
+        /// UpdateFailed status
+        /// </summary>
         UpdateFailed
     }
 
@@ -230,6 +268,10 @@ namespace PepperDash.Essentials.Core.Config
         /// </summary>
         public eUpdateStatus UpdateStatus { get; private set; }
 
+        /// <summary>
+        /// ConfigStatusEventArgs Constructor
+        /// </summary>
+        /// <param name="status"></param>
         public ConfigStatusEventArgs(eUpdateStatus status)
         {
             UpdateStatus = status;

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

@@ -18,22 +18,29 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class ConfigWriter
     {
+        /// <summary>
+        /// LocalConfigFolder constant
+        /// </summary>
         public const string LocalConfigFolder = "LocalConfig";
 
+        /// <summary>
+        /// WriteTimeout constant
+        /// </summary>
         public const long WriteTimeout = 30000;
 
+        /// <summary>
+        /// WriteTimer variable
+        /// </summary>
         public static CTimer WriteTimer;
+
 		static CCriticalSection fileLock = new CCriticalSection();
 
         /// <summary>
         /// Updates the config properties of a device
         /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="properties"></param>
-        /// <returns></returns>
-        /// <summary>
-        /// UpdateDeviceProperties method
-        /// </summary>
+        /// <param name="deviceKey">The key of the device to update</param>
+        /// <param name="properties">The new properties for the device</param>
+        /// <returns>True if the update was successful, otherwise false</returns>
         public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
         {
             bool success = false;
@@ -59,6 +66,8 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// UpdateDeviceConfig method
         /// </summary>
+        /// <param name="config">The new device config</param>
+        /// <returns>True if the update was successful, otherwise false</returns>
         public static bool UpdateDeviceConfig(DeviceConfig config)
         {
             bool success = false;
@@ -82,6 +91,8 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// UpdateRoomConfig method
         /// </summary>
+        /// <param name="config">The new room config</param>
+        /// <returns>True if the update was successful, otherwise false</returns>
         public static bool UpdateRoomConfig(DeviceConfig config)
         {
             bool success = false;
@@ -118,7 +129,6 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Writes the current config to a file in the LocalConfig subfolder
         /// </summary>
-        /// <returns></returns>
         private static void WriteConfigFile(object o)
         {
             var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
@@ -129,13 +139,10 @@ namespace PepperDash.Essentials.Core.Config
         }
 
         /// <summary>
-        /// Writes
-        /// </summary>
-        /// <param name="filepath"></param>
-        /// <param name="o"></param>
-        /// <summary>
-        /// WriteFile method
+        /// Writes the current config data to a file
         /// </summary>
+        /// <param name="filePath">The file path to write to</param>
+        /// <param name="configData">The config data to write</param>
         public static void WriteFile(string filePath, string configData)
         {
             if (WriteTimer != null)

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

@@ -11,86 +11,169 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.Config
 {
-	/// <summary>
-	/// Loads the ConfigObject from the file
-	/// </summary>
-	public class EssentialsConfig : BasicConfig
-	{
-		[JsonProperty("system_url")]
+    /// <summary>
+    /// Loads the ConfigObject from the file
+    /// </summary>
+    public class EssentialsConfig : BasicConfig
+    {
+        /// <summary>
+        /// Gets or sets the SystemUrl
+        /// </summary>
+        [JsonProperty("system_url")]
         public string SystemUrl { get; set; }
 
-		[JsonProperty("template_url")]
+        /// <summary>
+        /// 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
             {
-				if (string.IsNullOrEmpty(SystemUrl))
-					return "missing url";
+                string uuid;
 
-				if (SystemUrl.Contains("#"))
-				{
-					var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
-					string uuid = result.Groups[1].Value;
-					return uuid;
-				} else
-				{
+                if (string.IsNullOrEmpty(SystemUrl))
+                {
+                    uuid = "missing url";
+                }
+                else if (SystemUrl.Contains("#"))
+                {
+                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
+                    uuid = result.Groups[1].Value;
+                }
+                else if (SystemUrl.Contains("detail"))
+                {
+                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/detail\/(.*)\/.*");
+                    uuid = result.Groups[1].Value;
+                }
+                else
+                {
                     var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
-                    string uuid = result.Groups[1].Value;
-                    return uuid;
+                    uuid = result.Groups[1].Value;
                 }
+
+                return uuid;
             }
         }
 
+        /// <summary>
+        /// Gets the TemplateUuid extracted from the TemplateUrl
+        /// </summary>
 		[JsonProperty("templateUuid")]
-		public string TemplateUuid
+        public string TemplateUuid
         {
             get
             {
-				if (string.IsNullOrEmpty(TemplateUrl))
-					return "missing template url";
+                string uuid;
 
-				if (TemplateUrl.Contains("#"))
-				{
-					var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
-					string uuid = result.Groups[1].Value;
-					return uuid;
-				} else
-				{
-                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
-                    string uuid = result.Groups[2].Value;
-                    return uuid;
+                if (string.IsNullOrEmpty(TemplateUrl))
+                {
+                    uuid = "missing template url";
                 }
+                else if (TemplateUrl.Contains("#"))
+                {
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
+                    uuid = result.Groups[1].Value;
+                }
+                else if (TemplateUrl.Contains("detail"))
+                {
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/detail\/(.*)\/system-template-versions\/detail\/(.*)\/.*");
+                    uuid = result.Groups[2].Value;
+                }
+                else
+                {
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
+                    uuid = result.Groups[2].Value;
+                }
+
+                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>
- /// Represents a SystemTemplateConfigs
- /// </summary>
-	public class SystemTemplateConfigs
-	{
-  /// <summary>
-  /// Gets or sets the System
-  /// </summary>
+    }
+
+    /// <summary>
+    /// Represents version data for Essentials and its packages
+    /// </summary>
+    public class VersionData
+    {
+        /// <summary>
+        /// Gets or sets the Essentials version
+        /// </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/Config/ILoadConfig.cs

@@ -11,6 +11,9 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface ILoadConfig
     {
+        /// <summary>
+        /// GoWithLoad method
+        /// </summary>
         void GoWithLoad();
     }
 }

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

@@ -12,45 +12,57 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class InfoConfig
 	{
+        /// <summary>
+        /// Gets or sets the Name
+        /// </summary>
 		[JsonProperty("name")]
 		public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Date
+        /// </summary>
 		[JsonProperty("date")]
 		public DateTime Date { get; set; }
 		
+        /// <summary>
+        /// Gets or sets the Type
+        /// </summary>
 		[JsonProperty("type")]
 		public string Type { get; set; }
 		
+        /// <summary>
+        /// Gets or sets the Version
+        /// </summary>
 		[JsonProperty("version")]
-  /// <summary>
-  /// Gets or sets the Version
-  /// </summary>
 		public string Version { get; set; }
 
-        [JsonProperty("runtimeInfo")]
         /// <summary>
         /// Gets or sets the RuntimeInfo
         /// </summary>
+        [JsonProperty("runtimeInfo")]
         public RuntimeInfo RuntimeInfo { get; set; } 
 		
+        /// <summary>
+        /// Gets or sets the Comment
+        /// </summary>
 		[JsonProperty("comment")]
-  /// <summary>
-  /// Gets or sets the Comment
-  /// </summary>
 		public string Comment { get; set; }
 
-        [JsonProperty("hostname")]
         /// <summary>
         /// Gets or sets the HostName
         /// </summary>
+        [JsonProperty("hostname")]
         public string HostName { get; set; }
 
-        [JsonProperty("appNumber")]
         /// <summary>
         /// Gets or sets the AppNumber
         /// </summary>
+        [JsonProperty("appNumber")]
         public uint AppNumber { get; set; }
 
+        /// <summary>
+        /// InfoConfig Constructor
+        /// </summary>
 		public InfoConfig()
 		{
 			Name = "";

src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs

@@ -9,8 +9,14 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
+    /// <summary>
+    /// Abstract base class for Crestron GenericBase devices
+    /// </summary>
 	public abstract class CrestronGenericBaseDevice : EssentialsDevice, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
 	{
+        /// <summary>
+        /// Gets or sets the Hardware
+        /// </summary>
 	    protected GenericBase Hardware;
 
         /// <summary>
@@ -18,24 +24,32 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public FeedbackCollection<Feedback> Feedbacks { get; private set; }
 
-  /// <summary>
-  /// Gets or sets the IsOnline
-  /// </summary>
+        /// <summary>
+        /// Gets or sets the IsOnline
+        /// </summary>
 		public BoolFeedback IsOnline { get; private set; }
-  /// <summary>
-  /// Gets or sets the IsRegistered
-  /// </summary>
+
+        /// <summary>
+        /// Gets or sets the IsRegistered
+        /// </summary>
 		public BoolFeedback IsRegistered { get; private set; }
-  /// <summary>
-  /// Gets or sets the IpConnectionsText
-  /// </summary>
+
+        /// <summary>
+        /// Gets or sets the IpConnectionsText
+        /// </summary>
 		public StringFeedback IpConnectionsText { get; private set; }
 
-  /// <summary>
-  /// Gets or sets the PreventRegistration
-  /// </summary>
+        /// <summary>
+        /// Gets or sets the PreventRegistration
+        /// </summary>
 		public bool PreventRegistration { get; protected set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="name">name of the device</param>
+        /// <param name="hardware">hardware instance</param>
 	    protected CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
             : base(key, name)
         {
@@ -50,6 +64,11 @@ namespace PepperDash.Essentials.Core
             CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
         }
 
+        /// <summary>
+        /// Constructor without hardware instance
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="name">name of the device</param>
         protected CrestronGenericBaseDevice(string key, string name)
             : base(key, name)
         {
@@ -57,6 +76,10 @@ namespace PepperDash.Essentials.Core
 
         }
 
+        /// <summary>
+        /// Registers the Crestron GenericBase hardware instance
+        /// </summary>
+        /// <param name="hardware">hardware instance</param>
 	    protected void RegisterCrestronGenericBase(GenericBase hardware)
 	    {
             Hardware = hardware;
@@ -68,10 +91,10 @@ namespace PepperDash.Essentials.Core
             CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
 	    }
 
-  /// <summary>
-  /// CustomActivate method
-  /// </summary>
-  /// <inheritdoc />
+        /// <summary>
+        /// CustomActivate method
+        /// </summary>
+        /// <inheritdoc />
 		public override bool CustomActivate()
 		{
             Debug.LogMessage(LogEventLevel.Information, this, "Activating");
@@ -118,11 +141,7 @@ namespace PepperDash.Essentials.Core
 		/// <summary>
 		/// This disconnects events and unregisters the base hardware device.
 		/// </summary>
-		/// <returns></returns>
-  /// <summary>
-  /// Deactivate method
-  /// </summary>
-  /// <inheritdoc />
+		/// <returns>true if successful, otherwise false</returns>
 		public override bool Deactivate()
 		{
 			CommunicationMonitor.Stop();
@@ -138,10 +157,7 @@ namespace PepperDash.Essentials.Core
 	    /// <summary>
         /// Adds feedback(s) to the list
         /// </summary>
-        /// <param name="newFbs"></param>
-        /// <summary>
-        /// AddToFeedbackList method
-        /// </summary>
+        /// <param name="newFbs">feedback(s) to be added to the list</param>
         public void AddToFeedbackList(params Feedback[] newFbs)
         {
             foreach (var f in newFbs)
@@ -173,9 +189,9 @@ namespace PepperDash.Essentials.Core
 
 		#region IStatusMonitor Members
 
-  /// <summary>
-  /// Gets or sets the CommunicationMonitor
-  /// </summary>
+        /// <summary>
+        /// Gets or sets the CommunicationMonitor
+        /// </summary>
 		public StatusMonitorBase CommunicationMonitor { get; private set; }
 		#endregion
 
@@ -189,29 +205,57 @@ namespace PepperDash.Essentials.Core
         #endregion
 	}
 
+    /// <summary>
+    /// Abstract base class for Crestron GenericBase devices that are bridgeable
+    /// </summary>
     public abstract class CrestronGenericBridgeableBaseDevice : CrestronGenericBaseDevice, IBridgeAdvanced
     {
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="name">name of the device</param>
+        /// <param name="hardware">hardware instance</param>
         protected CrestronGenericBridgeableBaseDevice(string key, string name, GenericBase hardware) : base(key, name, hardware)
         {
         }
 
+        /// <summary>
+        /// Constructor without hardware instance
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="name">name of the device</param>
         protected CrestronGenericBridgeableBaseDevice(string key, string name)
             : base(key, name)
         {
         }
 
-
+        /// <summary>
+        /// Links to API
+        /// </summary>
+        /// <param name="trilist">the trilist</param>
+        /// <param name="joinStart">the starting join number</param>
+        /// <param name="joinMapKey">the join map key</param>
+        /// <param name="bridge">the bridge instance</param>
         public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
 
 
 	//***********************************************************************************
- /// <summary>
- /// Represents a CrestronGenericBaseDeviceEventIds
- /// </summary>
+    /// <summary>
+    /// Represents a CrestronGenericBaseDeviceEventIds
+    /// </summary>
 	public class CrestronGenericBaseDeviceEventIds
 	{
+        /// <summary>
+        /// IsOnline event ID
+        /// </summary>
 		public const uint IsOnline = 1;
+
+        /// <summary>
+        /// IpConnectionsText event ID
+        /// </summary>
 		public const uint IpConnectionsText =2;
 	}
 
@@ -220,9 +264,11 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public static class GenericBaseExtensions
 	{
-  /// <summary>
-  /// RegisterWithLogging method
-  /// </summary>
+        /// <summary>
+        /// RegisterWithLogging method
+        /// </summary>
+        /// <param name="device">the GenericBase device</param>
+        /// <param name="key">the device key</param>
 		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
 		{
 		    var result = device.Register();

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

@@ -2,59 +2,57 @@
 
 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>
-    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
+    /// [Description("Wrapper class for Digital Input")]
+    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IHasFeedback
     {
-        /// <summary>
-        /// Gets or sets the InputPort
-        /// </summary>
-        public DigitalInput InputPort { get; private set; }
+        private DigitalInput inputPort;
+        private readonly bool invertState;
 
         /// <summary>
         /// Gets or sets the InputStateFeedback
         /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        Func<bool> InputStateFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.State;
-            }
-        }
-
+        /// <inheritdoc />
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
 
+        /// <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(InputStateFeedbackFunc);
+            invertState = string.Equals(config.CircuitType, "NC", StringComparison.OrdinalIgnoreCase);
+
+            InputStateFeedback = new BoolFeedback("inputState", () => invertState ? !inputPort.State : inputPort.State);
 
             AddPostActivationAction(() =>
             {
-                InputPort = postActivationFunc(config);
+                inputPort = postActivationFunc(config);
 
-                InputPort.Register();
-
-                InputPort.StateChange += InputPort_StateChange;
+                inputPort.Register();
 
+                inputPort.StateChange += InputPort_StateChange;
             });
         }
 
@@ -71,41 +69,31 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         private static DigitalInput GetDigitalInput(IOPortConfig dc)
         {
-            IDigitalInputPorts ioPortDevice;
 
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsDigitalInput)
                 {
-                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Processor does not support Digital Inputs");
+                    Debug.LogError("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))
             {
-                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);
+                Debug.LogError("GetDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfDigitalInputPorts)
             {
-                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogError("GetDigitalInput: Device {key} does not contain a digital input port {port}", dc.PortDeviceKey, dc.PortNumber);
+                return null;
             }
 
             return ioPortDevice.DigitalInputPorts[dc.PortNumber];
-
-
         }
 
         #endregion
@@ -131,20 +119,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+                this.LogError("Unable to link device {key}.  {message}", Key, e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
         }
 
@@ -153,22 +141,22 @@ namespace PepperDash.Essentials.Core.CrestronIO
         #region Factory
 
         /// <summary>
-        /// Represents a GenericDigitalInputDeviceFactory
+        /// Factory for creating GenericDigitalInputDevice devices
         /// </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.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Digital Input Device");
+                Debug.LogDebug("Factory Attempting to create new Generic Digital Input Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

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

@@ -21,11 +21,22 @@ namespace PepperDash.Essentials.Core.CrestronIO
     [Description("Wrapper class for a Relay")]
     public class GenericRelayDevice : EssentialsBridgeableDevice, ISwitchedOutput
     {
+        /// <summary>
+        /// The RelayOutput controlled by this device
+        /// </summary>
         public Relay RelayOutput { get; private set; }
 
+        /// <summary>
+        /// Feedback to indicate whether the output is on
+        /// </summary>
         public BoolFeedback OutputIsOnFeedback { get; private set; }
 
         //Maintained for compatibility with PepperDash.Essentials.Core.Devices.CrestronProcessor
+        /// <summary>
+        /// Constructor for GenericRelayDevice
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="relay">Relay output controlled by this device</param>
         public GenericRelayDevice(string key, Relay relay) :
             base(key)
         {
@@ -37,6 +48,13 @@ namespace PepperDash.Essentials.Core.CrestronIO
             RelayOutput.StateChange += RelayOutput_StateChange;
         }
 
+        /// <summary>
+        /// Constructor for GenericRelayDevice
+        /// </summary>
+        /// <param name="key">key of the device</param>
+        /// <param name="name">name of the device</param>
+        /// <param name="postActivationFunc">function to get the relay output</param>
+        /// <param name="config">IO port configuration</param>
         public GenericRelayDevice(string key, string name, Func<IOPortConfig, Relay> postActivationFunc,
             IOPortConfig config)
             : base(key, name)
@@ -212,6 +230,9 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public class GenericRelayDeviceFactory : EssentialsDeviceFactory<GenericRelayDevice>
         {
+            /// <summary>
+            /// Constructor for GenericRelayDeviceFactory
+            /// </summary>
             public GenericRelayDeviceFactory()
             {
                 TypeNames = new List<string>() { "relayoutput" };

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

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

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

@@ -2,78 +2,86 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Bridges;
-
-
 using Newtonsoft.Json;
-using Serilog.Events;
+using PepperDash.Core;
+using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider
+    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider, IHasFeedback
     {
-        public Versiport InputPort { get; private set; }
+        private Versiport inputPort;
+        private readonly bool invertState;
 
+        /// <summary>
+        /// Gets or sets the InputStateFeedback
+        /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        Func<bool> InputStateFeedbackFunc
-        {
-            get
-            {
-                return () => InputPort.DigitalIn;
-            }
-        }
+        /// <inheritdoc />
+        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
 
         /// <summary>
         /// Gets or sets the PartitionPresentFeedback
         /// </summary>
         public BoolFeedback PartitionPresentFeedback { get; }
 
-        public bool PartitionPresent => !InputStateFeedbackFunc();
+        /// <summary>
+        /// 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(InputStateFeedbackFunc);
-            PartitionPresentFeedback = new BoolFeedback(() => !InputStateFeedbackFunc());
+            var circuitType = string.IsNullOrEmpty(config.CircuitType) ? "NO" : config.CircuitType;
+            invertState = circuitType.Equals("NC", StringComparison.OrdinalIgnoreCase);
+
+            InputStateFeedback = new BoolFeedback("inputState", () => invertState ? !inputPort.DigitalIn : inputPort.DigitalIn);
+            PartitionPresentFeedback = new BoolFeedback("partitionPresent", () => !inputPort.DigitalIn);
 
             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();
 
-                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+                this.LogDebug("Created GenericVersiportDigitalInputDevice for port {port}.  DisablePullUpResistor: {pullUpResistorDisable}", config.PortNumber, inputPort.DisablePullUpResistor);
 
             });
 
+            Feedbacks.Add(InputStateFeedback);
+            Feedbacks.Add(PartitionPresentFeedback);
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
+            this.LogDebug("Versiport change: {0}", args.Event);
 
-            if(args.Event == eVersiportEvent.DigitalInChange)
+            if (args.Event == eVersiportEvent.DigitalInChange)
             {
                 InputStateFeedback.FireUpdate();
                 PartitionPresentFeedback.FireUpdate();
@@ -102,20 +110,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+                this.LogError("Unable to link device {key}.  Input is null. {message}", Key, e.Message);
+                this.LogDebug(e, "Stack Trace: ");
             }
         }
 
@@ -127,63 +135,50 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
         {
-         
-            IIOPorts ioPortDevice;
-
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Processor does not support Versiports");
+                    Debug.LogError("GetVersiportDigitalInput: Processor does not support Versiports");
                     return null;
                 }
-                ioPortDevice = Global.ControlSystem;
+                return Global.ControlSystem.VersiPorts[dc.PortNumber];
             }
-            else
+
+            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
             {
-                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);
+                Debug.LogError("GetVersiportDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogError("GetVersiportDigitalInput: Device {key} does not contain versiport {port}", dc.PortDeviceKey, dc.PortNumber);
+                return null;
             }
 
             return ioPortDevice.VersiPorts[dc.PortNumber];
-
-
         }
     }
 
 
     /// <summary>
-    /// Represents a GenericVersiportDigitalInputDeviceFactory
+    /// Factory class for GenericVersiportDigitalInputDevice
     /// </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.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
+            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

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

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

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

@@ -12,6 +12,12 @@ 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/IDigitalInput.cs

@@ -11,6 +11,9 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public interface IDigitalInput
     {
+        /// <summary>
+        /// Feedback to indicate the state of the input
+        /// </summary>
         BoolFeedback InputStateFeedback { get; }
     }
 }

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

@@ -11,7 +11,15 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public interface IDigitalOutput
     {
+        /// <summary>
+        /// Feedback to indicate the state of the output
+        /// </summary>
         BoolFeedback OutputStateFeedback { get; }
+
+        /// <summary>
+        /// Sets the output state
+        /// </summary>
+        /// <param name="state">The desired state of the output</param>
         void SetOutput(bool state);
     }
 }

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

@@ -13,6 +13,9 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface IHasCresnetBranches
     {
+        /// <summary>
+        /// Collection of Cresnet branches
+        /// </summary>
         CrestronCollection<CresnetBranch> CresnetBranches { get; }
     }
 }

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

@@ -14,25 +14,35 @@ 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; }
+
+        /// <summary>
+        /// Gets or sets the circuit type: "NO" (Normally Open) or "NC" (Normally Closed)
+        /// If set to "NC", the input state will be inverted. Defaults to "NO" if not specified.
+        /// </summary>
+        [JsonProperty("circuitType")]
+        public string CircuitType { get; set; } = "NO";
     }
 }

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

@@ -13,14 +13,30 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public interface ISwitchedOutput
     {
+        /// <summary>
+        /// Feedback to indicate whether the output is on
+        /// </summary>
         BoolFeedback OutputIsOnFeedback {get;}
 
+        /// <summary>
+        /// Turns the output on
+        /// </summary>
         void On();
+
+        /// <summary>
+        /// Turns the output off
+        /// </summary>
         void Off();
     }
 
+    /// <summary>
+    /// Describes a collection of switched outputs
+    /// </summary>
     public interface ISwitchedOutputCollection
     {
+        /// <summary>
+        /// Dictionary of switched outputs by their port number
+        /// </summary>
         Dictionary<uint, ISwitchedOutput> SwitchedOutputs { get; }
     }
 }

src/PepperDash.Essentials.Core/Device Info/DeviceInfoEventArgs.cs

@@ -12,11 +12,18 @@ namespace PepperDash.Essentials.Core.DeviceInfo
         /// </summary>
         public DeviceInfo DeviceInfo { get; set; }
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
         public DeviceInfoEventArgs()
         {
             
         }
 
+        /// <summary>
+        /// Constructor with DeviceInfo
+        /// </summary>
+        /// <param name="devInfo">the DeviceInfo instance</param>
         public DeviceInfoEventArgs(DeviceInfo devInfo)
         {
             DeviceInfo = devInfo;

src/PepperDash.Essentials.Core/Device Info/IDeviceInfoProvider.cs

@@ -8,10 +8,19 @@ namespace PepperDash.Essentials.Core.DeviceInfo
     /// </summary>
     public interface IDeviceInfoProvider:IKeyed
     {
+        /// <summary>
+        /// Gets the DeviceInfo
+        /// </summary>
         DeviceInfo DeviceInfo { get; }
 
+        /// <summary>
+        /// Event fired when DeviceInfo changes
+        /// </summary>
         event DeviceInfoChangeHandler DeviceInfoChanged;
 
+        /// <summary>
+        /// Updates the DeviceInfo
+        /// </summary>
         void UpdateDeviceInfo();
     }
 

src/PepperDash.Essentials.Core/Device Info/NetworkDeviceHelpers.cs

@@ -8,6 +8,9 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.DeviceInfo
 {
+    /// <summary>
+    /// Static class NetworkDeviceHelpers
+    /// </summary>
     public static class NetworkDeviceHelpers
     {
         /// <summary>
@@ -167,7 +170,14 @@ namespace PepperDash.Essentials.Core.DeviceInfo
     /// </summary>
     public class ArpEntry
     {
+        /// <summary>
+        /// The IP Address of the ARP Entry
+        /// </summary>
         public readonly IPAddress IpAddress;
+
+        /// <summary>
+        /// The MAC Address of the ARP Entry
+        /// </summary>
         public readonly string MacAddress;
 
         /// <summary>

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

@@ -0,0 +1,14 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines minimum functionality for an audio zone
+  /// </summary>
+  public interface IAudioZone : IBasicVolumeWithFeedback
+  {
+    /// <summary>
+    /// Selects the specified input
+    /// </summary>
+    /// <param name="input">The input to select</param>
+    void SelectInput(ushort input);
+  }
+}

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

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Identifies a device that contains audio zones
+  /// </summary>
+  public interface IAudioZones : IRouting
+  {
+    /// <summary>
+    /// Gets the collection of audio zones
+    /// </summary>
+    Dictionary<uint, IAudioZone> Zone { get; }
+  }
+}

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

@@ -0,0 +1,27 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// Defines minimal volume and mute control methods
+	/// </summary>
+	public interface IBasicVolumeControls : IKeyName
+	{
+		/// <summary>
+		/// Increases the volume
+		/// </summary>
+		/// <param name="pressRelease">Indicates whether the volume change is a press and hold action</param>
+		void VolumeUp(bool pressRelease);
+
+		/// <summary>
+		/// Decreases the volume
+		/// </summary>
+		/// <param name="pressRelease">Indicates whether the volume change is a press and hold action</param>
+		void VolumeDown(bool pressRelease);
+
+		/// <summary>
+		/// Toggles the mute state
+		/// </summary>
+		void MuteToggle();
+	}
+}

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

@@ -0,0 +1,34 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IBasicVolumeWithFeedback
+  /// </summary>
+  public interface IBasicVolumeWithFeedback : IBasicVolumeControls
+  {
+    /// <summary>
+    /// Gets the mute feedback
+    /// </summary>
+    BoolFeedback MuteFeedback { get; }
+
+    /// <summary>
+    /// Mutes the volume
+    /// </summary>
+    void MuteOn();
+
+    /// <summary>
+    /// Unmutes the volume
+    /// </summary>
+    void MuteOff();
+
+    /// <summary>
+    /// Sets the volume to the specified level
+    /// </summary>
+    /// <param name="level">The volume level to set</param>
+    void SetVolume(ushort level);
+
+    /// <summary>
+    /// Gets the mute feedback
+    /// </summary>
+    IntFeedback VolumeLevelFeedback { get; }
+  }
+}

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

@@ -0,0 +1,18 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IBasicVolumeWithFeedbackAdvanced
+  /// </summary>
+  public interface IBasicVolumeWithFeedbackAdvanced : IBasicVolumeWithFeedback
+  {
+    /// <summary>
+    /// Gets the raw volume level
+    /// </summary>
+    int RawVolumeLevel { get; }
+
+    /// <summary>
+    /// Gets the volume level units
+    /// </summary>
+    eVolumeLevelUnits Units { get; }
+  }
+}

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

@@ -7,26 +7,56 @@ using PepperDash.Essentials.Core.SmartObjects;
 namespace PepperDash.Essentials.Core
 {
 	/// <summary>
-	/// 
+	/// Defines the contract for IChannel
 	/// </summary>
 	public interface IChannel
 	{
+		/// <summary>
+		/// Channel up
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
+		/// 
 		void ChannelUp(bool pressRelease);
+		/// <summary>
+		/// Channel down
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void ChannelDown(bool pressRelease);
+
+		/// <summary>
+		/// Last channel
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void LastChannel(bool pressRelease);
+
+		/// <summary>
+		/// Guide
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
+		/// 
 		void Guide(bool pressRelease);
+
+		/// <summary>
+		/// Info
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void Info(bool pressRelease);
+
+		/// <summary>
+		/// Exit
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void Exit(bool pressRelease);
 	}
 
 	/// <summary>
-	/// 
+	/// IChannelExtensions class
 	/// </summary>
 	public static class IChannelExtensions
 	{
-  /// <summary>
-  /// LinkButtons method
-  /// </summary>
+		/// <summary>
+		/// LinkButtons method
+		/// </summary>
 		public static void LinkButtons(this IChannel dev, BasicTriList triList)
 		{
 			triList.SetBoolSigAction(123, dev.ChannelUp);
@@ -37,9 +67,9 @@ namespace PepperDash.Essentials.Core
 			triList.SetBoolSigAction(134, dev.Exit);
 		}
 
-  /// <summary>
-  /// UnlinkButtons method
-  /// </summary>
+		/// <summary>
+		/// UnlinkButtons method
+		/// </summary>
 		public static void UnlinkButtons(this IChannel dev, BasicTriList triList)
 		{
 			triList.ClearBoolSigAction(123);

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

@@ -7,24 +7,45 @@ using PepperDash.Essentials.Core.SmartObjects;
 namespace PepperDash.Essentials.Core
 {
 	/// <summary>
-	/// 
+	/// IColor interface
 	/// </summary>
 	public interface IColor
 	{
+		/// <summary>
+		/// Red button
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void Red(bool pressRelease);
+
+		/// <summary>
+		/// Green button
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void Green(bool pressRelease);
+
+		/// <summary>
+		/// Yellow button
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void Yellow(bool pressRelease);
+
+		/// <summary>
+		/// Blue button
+		/// </summary>
+		/// <param name="pressRelease">indicates whether this is a press or release</param>
 		void Blue(bool pressRelease);
 	}
 
 	/// <summary>
-	/// 
+	/// IColorExtensions class
 	/// </summary>
 	public static class IColorExtensions
 	{
-  /// <summary>
-  /// LinkButtons method
-  /// </summary>
+		/// <summary>
+		/// LinkButtons method
+		/// </summary>
+		/// <param name="dev">The IColor device</param>
+		/// <param name="TriList">The BasicTriList to link</param>
 		public static void LinkButtons(this IColor dev, BasicTriList TriList)
 		{
 			TriList.SetBoolSigAction(155, dev.Red);
@@ -33,9 +54,11 @@ namespace PepperDash.Essentials.Core
 			TriList.SetBoolSigAction(158, dev.Blue);
 		}
 
-  /// <summary>
-  /// UnlinkButtons method
-  /// </summary>
+		/// <summary>
+		/// UnlinkButtons method
+		/// </summary>
+		/// <param name="dev">The IColor device</param>
+		/// <param name="triList">The BasicTriList to unlink</param>
 		public static void UnlinkButtons(this IColor dev, BasicTriList triList)
 		{
 			triList.ClearBoolSigAction(155);

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

@@ -0,0 +1,11 @@
+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/IDPad.cs

@@ -11,23 +11,57 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public interface IDPad : IKeyed
 	{
+		/// <summary>
+		/// Up button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Up(bool pressRelease);
+
+		/// <summary>
+		/// Down button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Down(bool pressRelease);
+
+		/// <summary>
+		/// Left button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Left(bool pressRelease);
+
+		/// <summary>
+		/// Right button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Right(bool pressRelease);
+
+		/// <summary>
+		/// Select button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Select(bool pressRelease);
+
+		/// <summary>
+		/// Menu button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Menu(bool pressRelease);
+
+		/// <summary>
+		/// Exit button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Exit(bool pressRelease);
 	}
 
 	/// <summary>
-	/// 
+	/// IDPadExtensions class
 	/// </summary>
 	public static class IDPadExtensions
 	{
-  /// <summary>
-  /// LinkButtons method
-  /// </summary>
+		/// <summary>
+		/// LinkButtons method
+		/// </summary>
 		public static void LinkButtons(this IDPad dev, BasicTriList triList)
 		{
 			triList.SetBoolSigAction(138, dev.Up);
@@ -39,9 +73,9 @@ namespace PepperDash.Essentials.Core
 			triList.SetBoolSigAction(134, dev.Exit);        
 		}
 
-  /// <summary>
-  /// UnlinkButtons method
-  /// </summary>
+		/// <summary>
+		/// UnlinkButtons method
+		/// </summary>
 		public static void UnlinkButtons(this IDPad dev, BasicTriList triList)
 		{
 			triList.ClearBoolSigAction(138);

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

@@ -11,15 +11,54 @@ namespace PepperDash.Essentials.Core.Devices.DeviceTypeInterfaces
  /// </summary>
 	public interface IDisplayBasic
 	{
+		/// <summary>
+		/// Sets the input to HDMI 1
+		/// </summary>
 		void InputHdmi1();
+
+		/// <summary>
+		/// Sets the input to HDMI 2
+		/// </summary>
 		void InputHdmi2();
+
+		/// <summary>
+		/// Sets the input to HDMI 3
+		/// </summary>
 		void InputHdmi3();
+
+		/// <summary>
+		/// Sets the input to HDMI 4
+		/// </summary>
 		void InputHdmi4();
+
+		/// <summary>
+		/// Sets the input to DisplayPort 1
+		/// </summary>
 		void InputDisplayPort1();
+
+		/// <summary>
+		/// Sets the input to DVI 1
+		/// </summary>
 		void InputDvi1();
+
+		/// <summary>
+		/// Sets the input to Video 1
+		/// </summary>
 		void InputVideo1();
+
+		/// <summary>
+		/// Sets the input to VGA 1
+		/// </summary>
 		void InputVga1();
+		
+		/// <summary>
+		/// Sets the input to VGA 2
+		/// </summary>
 		void InputVga2();
+
+		/// <summary>
+		/// Sets the input to RGB 1
+		/// </summary>
 		void InputRgb1();
 	}
 }

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

@@ -16,24 +16,40 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public interface IDvr : IDPad
 	{
+		/// <summary>
+		/// DVR List button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void DvrList(bool pressRelease);
+
+		/// <summary>
+		/// Record button press
+		/// </summary>
+		/// <param name="pressRelease">determines if the button is pressed or released</param>
 		void Record(bool pressRelease);
 	}
 
 	/// <summary>
-	/// 
+	/// IDvrExtensions class
 	/// </summary>
 	public static class IDvrExtensions
 	{
-  /// <summary>
-  /// LinkButtons method
-  /// </summary>
+		/// <summary>
+		/// LinkButtons method
+		/// </summary>
+		/// <param name="dev">IDvr device</param>
+		/// <param name="triList">BasicTriList to link to</param>
 		public static void LinkButtons(this IDvr dev, BasicTriList triList)
 		{
 			triList.SetBoolSigAction(136, dev.DvrList);
 			triList.SetBoolSigAction(152, dev.Record);
 		}
 
+		/// <summary>
+		/// UnlinkButtons method
+		/// </summary>
+		/// <param name="dev">IDvr device</param>
+		/// <param name="triList">BasicTriList to unlink from</param>
 		public static void UnlinkButtons(this IDvr dev, BasicTriList triList)
 		{
 			triList.ClearBoolSigAction(136);

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

@@ -11,7 +11,15 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IEmergencyOSD
     {
+        /// <summary>
+        /// Shows an emergency message on the OSD
+        /// </summary>
+        /// <param name="url">The URL of the emergency message to display</param>
         void ShowEmergencyMessage(string url);
+
+        /// <summary>
+        /// Hides the emergency message from the OSD
+        /// </summary>
         void HideEmergencyMessage();
     }
 }

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

@@ -0,0 +1,153 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IFullAudioSettings
+  /// </summary>
+  public interface IFullAudioSettings : IBasicVolumeWithFeedback
+  {
+    /// <summary>
+    /// SetBalance method
+    /// </summary>
+    /// <param name="level">level to set</param>
+    void SetBalance(ushort level);
+
+    /// <summary>
+    /// BalanceLeft method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void BalanceLeft(bool pressRelease);
+
+    /// <summary>
+    /// BalanceRight method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void BalanceRight(bool pressRelease);
+
+    /// <summary>
+    /// SetBass method
+    /// </summary>
+    /// <param name="level">level to set</param>
+    void SetBass(ushort level);
+
+    /// <summary>
+    /// BassUp method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void BassUp(bool pressRelease);
+
+    /// <summary>
+    /// BassDown method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void BassDown(bool pressRelease);
+
+    /// <summary>
+    /// SetTreble method
+    /// </summary>
+    /// <param name="level">level to set</param>
+    void SetTreble(ushort level);
+
+    /// <summary>
+    /// TrebleUp method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void TrebleUp(bool pressRelease);
+
+    /// <summary>
+    /// TrebleDown method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void TrebleDown(bool pressRelease);
+
+    /// <summary>
+    /// hasMaxVolume property
+    /// </summary>
+    bool hasMaxVolume { get; }
+
+    /// <summary>
+    /// SetMaxVolume method
+    /// </summary>
+    /// <param name="level">level to set</param>
+    void SetMaxVolume(ushort level);
+
+    /// <summary>
+    /// MaxVolumeUp method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void MaxVolumeUp(bool pressRelease);
+
+    /// <summary>
+    /// MaxVolumeDown method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void MaxVolumeDown(bool pressRelease);
+
+    /// <summary>
+    /// hasDefaultVolume property
+    /// </summary>
+    bool hasDefaultVolume { get; }
+
+    /// <summary>
+    /// SetDefaultVolume method
+    /// </summary>
+    /// <param name="level">level to set</param>
+    void SetDefaultVolume(ushort level);
+
+    /// <summary>
+    /// DefaultVolumeUp method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void DefaultVolumeUp(bool pressRelease);
+
+    /// <summary>
+    /// DefaultVolumeDown method
+    /// </summary>
+    /// <param name="pressRelease">determines if the button is pressed or released</param>
+    void DefaultVolumeDown(bool pressRelease);
+
+    /// <summary>
+    /// LoudnessToggle method
+    /// </summary>
+    void LoudnessToggle();
+
+    /// <summary>
+    /// MonoToggle method
+    /// </summary>
+    void MonoToggle();
+
+    /// <summary>
+    /// LoudnessFeedback property
+    /// </summary>
+    BoolFeedback LoudnessFeedback { get; }
+
+    /// <summary>
+    /// MonoFeedback property
+    /// </summary>
+    BoolFeedback MonoFeedback { get; }
+
+    /// <summary>
+    /// BalanceFeedback property
+    /// </summary>
+    IntFeedback BalanceFeedback { get; }
+
+    /// <summary>
+    /// BassFeedback property
+    /// </summary>
+    IntFeedback BassFeedback { get; }
+
+    /// <summary>
+    /// TrebleFeedback property
+    /// </summary>
+    IntFeedback TrebleFeedback { get; }
+
+    /// <summary>
+    /// MaxVolumeFeedback property
+    /// </summary>
+    IntFeedback MaxVolumeFeedback { get; }
+
+    /// <summary>
+    /// DefaultVolumeFeedback property
+    /// </summary>
+    IntFeedback DefaultVolumeFeedback { get; }
+  }
+}