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

.gitignore

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

src/Directory.Build.props

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

src/Directory.Build.targets

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

src/PepperDash.Core/Comm/eControlMethods.cs

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

src/PepperDash.Core/Logging/Debug.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
@@ -20,6 +19,7 @@ using Serilog.Templates;
 namespace PepperDash.Core
 {
     /// <summary>
+    /// Contains debug commands for use in various situations
     /// </summary>
     public static class Debug
     {
@@ -272,9 +272,6 @@ 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");
-
-                    CrestronDataStoreStatic.SetLocalIntValue(levelStoreKey, (int)LogEventLevel.Information);
-
                     return LogEventLevel.Information;
                 }
 
@@ -349,13 +346,13 @@ namespace PepperDash.Core
                 if (levelString.Trim() == "?")
                 {
                     CrestronConsole.ConsoleCommandResponse(
-                    "Used to set the minimum level of debug messages to be printed to the console:\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");
+                    $@"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");
                     return;
                 }
 
@@ -376,7 +373,7 @@ namespace PepperDash.Core
                     return;
                 }
 
-                if (Enum.TryParse<LogEventLevel>(levelString, true, out var levelEnum))
+                if (Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
                 {
                     SetDebugLevel(levelEnum);
                     return;

src/PepperDash.Core/Logging/DebugExtensions.cs

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

src/PepperDash.Core/PepperDash.Core.csproj

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

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

@@ -2,12 +2,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 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.Essentials.Core.Config;
 using Serilog.Events;
@@ -353,22 +355,22 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class EiscApiPropertiesConfig
     {
+        [JsonProperty("control")]
         /// <summary>
         /// Gets or sets the Control
         /// </summary>
-        [JsonProperty("control")]
         public EssentialsControlPropertiesConfig Control { get; set; }
 
+        [JsonProperty("devices")]
         /// <summary>
         /// Gets or sets the Devices
         /// </summary>
-        [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        [JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
-        [JsonProperty("rooms")]
         public List<ApiRoomPropertiesConfig> Rooms { get; set; }
 
 
@@ -377,22 +379,22 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiDevicePropertiesConfig
         {
+            [JsonProperty("deviceKey")]
             /// <summary>
             /// Gets or sets the DeviceKey
             /// </summary>
-            [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }
 
+            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
-            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
-            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
@@ -401,22 +403,22 @@ 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; }
         }
 

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

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

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

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

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

@@ -1,9 +1,11 @@
 
 
 using System;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
@@ -36,9 +38,9 @@ namespace PepperDash.Essentials.Core
 		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
 		/// </summary>
 		/// <param name="deviceConfig">The Device config object</param>
-		/// <summary>
-		/// CreateCommForDevice method
-		/// </summary>
+  /// <summary>
+  /// CreateCommForDevice method
+  /// </summary>
 		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
 		{
 			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
@@ -54,38 +56,35 @@ namespace PepperDash.Essentials.Core
 					case eControlMethod.Com:
 						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, 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.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);
+                            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.Telnet:
 						break;
 					case eControlMethod.SecureTcpIp:
@@ -99,7 +98,7 @@ namespace PepperDash.Essentials.Core
 						}
 					default:
 						break;
-				}
+				}				
 			}
 			catch (Exception e)
 			{
@@ -108,14 +107,15 @@ namespace PepperDash.Essentials.Core
 			}
 
 			// put it in the device manager if it's the right flavor
-			if (comm is Device comDev)
+			var comDev = comm as Device;
+			if (comDev != null)
 				DeviceManager.AddDevice(comDev);
 			return comm;
 		}
 
-		/// <summary>
-		/// GetComPort method
-		/// </summary>
+  /// <summary>
+  /// GetComPort method
+  /// </summary>
 		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
 		{
 			var comPar = config.ComParams;
@@ -126,74 +126,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 +210,81 @@ namespace PepperDash.Essentials.Core
 		}
 	}
 
-	/// <summary>
-	/// Represents a EssentialsControlPropertiesConfig
-	/// </summary>
-	public class EssentialsControlPropertiesConfig :
-			ControlPropertiesConfig
-	{
+    /// <summary>
+    /// Represents a EssentialsControlPropertiesConfig
+    /// </summary>
+    public class EssentialsControlPropertiesConfig :
+        ControlPropertiesConfig
+    {
 
-		[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; }
 
-		[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));
+                }
+            }
+        }
 
-		[JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
-		/// <summary>
-		/// Gets or sets the InfinetId
-		/// </summary>
-		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/Config/BaseStreamingDeviceProperties.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -244,20 +244,6 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         [JsonProperty("type")]
         public eRoutingSignalType Type { get; set; }
-
-        /// <summary>
-        /// Key for a destination list item. If BOTH SourceListItemKey AND DestinationListItemKey are defined,
-        /// then the direct route method should be used.
-        /// </summary>
-        [JsonProperty("destinationListItemKey", NullValueHandling = NullValueHandling.Ignore)]
-        public string DestinationListItemKey { get; set; }
-
-        /// <summary>
-        /// Key for a source list item. If BOTH SourceListItemKey AND DestinationListItemKey are defined,
-        /// then the direct route method should be used.
-        /// </summary>
-        [JsonProperty("sourceListItemKey", NullValueHandling = NullValueHandling.Ignore)]
-        public string SourceListItemKey { get; set; }
     }
 
     /// <summary>

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

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

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

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

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

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

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

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

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

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

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

@@ -9,11 +9,11 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Room.Config
 {
-    /// <summary>
-    /// Represents a EssentialsRoomConfigHelper
-    /// </summary>
-    public class EssentialsRoomConfigHelper
-    {
+ /// <summary>
+ /// Represents a EssentialsRoomConfigHelper
+ /// </summary>
+	public class EssentialsRoomConfigHelper
+	{
         /// <summary>
         /// GetEmergency method
         /// </summary>
@@ -31,100 +31,100 @@ namespace PepperDash.Essentials.Room.Config
             return null;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="props"></param>
-        /// <param name="room"></param>
-        /// <returns></returns>
-        /// <summary>
-        /// GetMicrophonePrivacy method
-        /// </summary>
-        public static MicrophonePrivacyController GetMicrophonePrivacy(
-            EssentialsRoomPropertiesConfig props, IPrivacy room)
-        {
-            var microphonePrivacy = props.MicrophonePrivacy;
-            if (microphonePrivacy == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Cannot create microphone privacy with null properties");
-                return null;
-            }
-            // Get the MicrophonePrivacy device from the device manager
-            var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as MicrophonePrivacyController);
-            // Set this room as the IPrivacy device
-            if (mP == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "ERROR: Selected device {0} is not MicrophonePrivacyController", props.MicrophonePrivacy.DeviceKey);
-                return null;
-            }
-            mP.SetPrivacyDevice(room);
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="props"></param>
+		/// <param name="room"></param>
+		/// <returns></returns>
+  /// <summary>
+  /// GetMicrophonePrivacy method
+  /// </summary>
+		public static MicrophonePrivacyController GetMicrophonePrivacy(
+			EssentialsRoomPropertiesConfig props, IPrivacy room)
+		{
+			var microphonePrivacy = props.MicrophonePrivacy;
+			if (microphonePrivacy == null)
+			{
+				Debug.LogMessage(LogEventLevel.Information, "Cannot create microphone privacy with null properties");
+				return null;
+			}
+			// Get the MicrophonePrivacy device from the device manager
+			var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as MicrophonePrivacyController);
+			// Set this room as the IPrivacy device
+			if (mP == null)
+			{
+				Debug.LogMessage(LogEventLevel.Information, "ERROR: Selected device {0} is not MicrophonePrivacyController", props.MicrophonePrivacy.DeviceKey);
+				return null;
+			}
+			mP.SetPrivacyDevice(room);
 
-            var behaviour = props.MicrophonePrivacy.Behaviour.ToLower();
+			var behaviour = props.MicrophonePrivacy.Behaviour.ToLower();
 
-            if (behaviour == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "WARNING: No behaviour defined for MicrophonePrivacyController");
-                return null;
-            }
-            if (behaviour == "trackroomstate")
-            {
-                // Tie LED enable to room power state
+			if (behaviour == null)
+			{
+				Debug.LogMessage(LogEventLevel.Information, "WARNING: No behaviour defined for MicrophonePrivacyController");
+				return null;
+			}
+			if (behaviour == "trackroomstate")
+			{
+				// Tie LED enable to room power state
                 var essRoom = room as IEssentialsRoom;
                 essRoom.OnFeedback.OutputChange += (o, a) =>
-                {
+				{
                     if (essRoom.OnFeedback.BoolValue)
-                        mP.EnableLeds = true;
-                    else
-                        mP.EnableLeds = false;
-                };
+						mP.EnableLeds = true;
+					else
+						mP.EnableLeds = false;
+				};
 
                 mP.EnableLeds = essRoom.OnFeedback.BoolValue;
-            }
-            else if (behaviour == "trackcallstate")
-            {
-                // Tie LED enable to room power state
+			}
+			else if (behaviour == "trackcallstate")
+			{
+				// Tie LED enable to room power state
                 var inCallRoom = room as IHasInCallFeedback;
                 inCallRoom.InCallFeedback.OutputChange += (o, a) =>
-                {
+				{
                     if (inCallRoom.InCallFeedback.BoolValue)
-                        mP.EnableLeds = true;
-                    else
-                        mP.EnableLeds = false;
-                };
+						mP.EnableLeds = true;
+					else
+						mP.EnableLeds = false;
+				};
 
                 mP.EnableLeds = inCallRoom.InCallFeedback.BoolValue;
-            }
+			}
 
-            return mP;
-        }
+			return mP;
+		}
+	
+	}
 
-    }
+ /// <summary>
+ /// Represents a EssentialsRoomPropertiesConfig
+ /// </summary>
+	public class EssentialsRoomPropertiesConfig
+	{
+		[JsonProperty("addresses")]
+		public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
 
-    /// <summary>
-    /// Represents a EssentialsRoomPropertiesConfig
-    /// </summary>
-    public class EssentialsRoomPropertiesConfig
-    {
-        [JsonProperty("addresses")]
-        public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
+		[JsonProperty("description")]
+		public string Description { get; set; }
 
-        [JsonProperty("description")]
-        public string Description { get; set; }
+		[JsonProperty("emergency")]
+		public EssentialsRoomEmergencyConfig Emergency { get; set; }
 
-        [JsonProperty("emergency")]
-        public EssentialsRoomEmergencyConfig Emergency { get; set; }
+		[JsonProperty("help")]
+  /// <summary>
+  /// Gets or sets the Help
+  /// </summary>
+		public EssentialsHelpPropertiesConfig Help { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Help
-        /// </summary>
-        [JsonProperty("help")]
-        public EssentialsHelpPropertiesConfig Help { get; set; }
-
-        /// <summary>
-        /// Gets or sets the HelpMessage
-        /// </summary>
-        [JsonProperty("helpMessage")]
-        public string HelpMessage { get; set; }
+		[JsonProperty("helpMessage")]
+  /// <summary>
+  /// Gets or sets the HelpMessage
+  /// </summary>
+		public string HelpMessage { get; set; }
 
         /// <summary>
         /// Read this value to get the help message.  It checks for the old and new config format.
@@ -133,94 +133,94 @@ namespace PepperDash.Essentials.Room.Config
         {
             get
             {
-                if (Help != null && !string.IsNullOrEmpty(Help.Message))
+                if(Help != null && !string.IsNullOrEmpty(Help.Message))
                 {
                     return Help.Message;
                 }
                 else
                 {
-                    return HelpMessage;
+                    return HelpMessage; 
                 }
             }
         }
 
-        /// <summary>
-        /// Gets or sets the Environment
-        /// </summary>
-        [JsonProperty("environment")]
-        public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
+		[JsonProperty("environment")]
+  /// <summary>
+  /// Gets or sets the Environment
+  /// </summary>
+		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LogoLight
-        /// </summary>
-        [JsonProperty("logo")]
-        public EssentialsLogoPropertiesConfig LogoLight { get; set; }
+		[JsonProperty("logo")]
+  /// <summary>
+  /// Gets or sets the LogoLight
+  /// </summary>
+		public EssentialsLogoPropertiesConfig LogoLight { get; set; }
 
+        [JsonProperty("logoDark")]
         /// <summary>
         /// Gets or sets the LogoDark
         /// </summary>
-        [JsonProperty("logoDark")]
         public EssentialsLogoPropertiesConfig LogoDark { get; set; }
+	
+		[JsonProperty("microphonePrivacy")]
+  /// <summary>
+  /// Gets or sets the MicrophonePrivacy
+  /// </summary>
+		public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
 
-        /// <summary>
-        /// Gets or sets the MicrophonePrivacy
-        /// </summary>
-        [JsonProperty("microphonePrivacy")]
-        public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
+		[JsonProperty("occupancy")]
+  /// <summary>
+  /// Gets or sets the Occupancy
+  /// </summary>
+		public EssentialsRoomOccSensorConfig Occupancy { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Occupancy
-        /// </summary>
-        [JsonProperty("occupancy")]
-        public EssentialsRoomOccSensorConfig Occupancy { get; set; }
+		[JsonProperty("oneButtonMeeting")]
+  /// <summary>
+  /// Gets or sets the OneButtonMeeting
+  /// </summary>
+		public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
 
-        /// <summary>
-        /// Gets or sets the OneButtonMeeting
-        /// </summary>
-        [JsonProperty("oneButtonMeeting")]
-        public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
+		[JsonProperty("shutdownVacancySeconds")]
+  /// <summary>
+  /// Gets or sets the ShutdownVacancySeconds
+  /// </summary>
+		public int ShutdownVacancySeconds { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ShutdownVacancySeconds
-        /// </summary>
-        [JsonProperty("shutdownVacancySeconds")]
-        public int ShutdownVacancySeconds { get; set; }
+		[JsonProperty("shutdownPromptSeconds")]
+  /// <summary>
+  /// Gets or sets the ShutdownPromptSeconds
+  /// </summary>
+		public int ShutdownPromptSeconds { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ShutdownPromptSeconds
-        /// </summary>
-        [JsonProperty("shutdownPromptSeconds")]
-        public int ShutdownPromptSeconds { get; set; }
+		[JsonProperty("tech")]
+  /// <summary>
+  /// Gets or sets the Tech
+  /// </summary>
+		public EssentialsRoomTechConfig Tech { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Tech
-        /// </summary>
-        [JsonProperty("tech")]
-        public EssentialsRoomTechConfig Tech { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Volumes
-        /// </summary>
-        [JsonProperty("volumes")]
-        public EssentialsRoomVolumesConfig Volumes { get; set; }
+		[JsonProperty("volumes")]
+  /// <summary>
+  /// Gets or sets the Volumes
+  /// </summary>
+		public EssentialsRoomVolumesConfig Volumes { get; set; }
 
+        [JsonProperty("fusion")]
         /// <summary>
         /// Gets or sets the Fusion
         /// </summary>
-        [JsonProperty("fusion")]
         public EssentialsRoomFusionConfig Fusion { get; set; }
 
+        [JsonProperty("essentialsRoomUiBehaviorConfig", NullValueHandling=NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the UiBehavior
         /// </summary>
-        [JsonProperty("essentialsRoomUiBehaviorConfig", NullValueHandling = NullValueHandling.Ignore)]
         public EssentialsRoomUiBehaviorConfig UiBehavior { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ZeroVolumeWhenSwtichingVolumeDevices
-        /// </summary>
-        [JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
-        public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
+		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
+  /// <summary>
+  /// Gets or sets the ZeroVolumeWhenSwtichingVolumeDevices
+  /// </summary>
+		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 
         /// <summary>
         /// Indicates if this room represents a combination of other rooms
@@ -236,7 +236,7 @@ namespace PepperDash.Essentials.Room.Config
             LogoLight = new EssentialsLogoPropertiesConfig();
             LogoDark = new EssentialsLogoPropertiesConfig();
         }
-    }
+	}
 
     /// <summary>
     /// Represents a EssentialsRoomUiBehaviorConfig
@@ -327,15 +327,15 @@ namespace PepperDash.Essentials.Room.Config
 
     }
 
-    /// <summary>
-    /// Represents a EssentialsEnvironmentPropertiesConfig
-    /// </summary>
-    public class EssentialsEnvironmentPropertiesConfig
-    {
-        /// <summary>
-        /// Gets or sets the Enabled
-        /// </summary>
-        public bool Enabled { get; set; }
+ /// <summary>
+ /// Represents a EssentialsEnvironmentPropertiesConfig
+ /// </summary>
+	public class EssentialsEnvironmentPropertiesConfig
+	{
+  /// <summary>
+  /// Gets or sets the Enabled
+  /// </summary>
+		public bool Enabled { get; set; }
 
         [JsonProperty("deviceKeys")]
         /// <summary>
@@ -348,7 +348,7 @@ namespace PepperDash.Essentials.Room.Config
             DeviceKeys = new List<string>();
         }
 
-    }
+	}
 
     /// <summary>
     /// Represents a EssentialsRoomFusionConfig
@@ -359,7 +359,7 @@ namespace PepperDash.Essentials.Room.Config
         {
             get
             {
-                try
+                try 
                 {
                     return Convert.ToUInt32(IpId, 16);
                 }
@@ -367,7 +367,7 @@ namespace PepperDash.Essentials.Room.Config
                 {
                     throw new FormatException(string.Format("ERROR:Unable to convert IP ID: {0} to hex.  Error:\n{1}", IpId));
                 }
-
+          
             }
         }
 
@@ -390,17 +390,17 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomMicrophonePrivacyConfig
     {
-        [JsonProperty("deviceKey")]
-        /// <summary>
-        /// Gets or sets the DeviceKey
-        /// </summary>
-        public string DeviceKey { get; set; }
+		[JsonProperty("deviceKey")]
+  /// <summary>
+  /// Gets or sets the DeviceKey
+  /// </summary>
+		public string DeviceKey { get; set; }
 
-        [JsonProperty("behaviour")]
-        /// <summary>
-        /// Gets or sets the Behaviour
-        /// </summary>
-        public string Behaviour { get; set; }
+		[JsonProperty("behaviour")]
+  /// <summary>
+  /// Gets or sets the Behaviour
+  /// </summary>
+		public string Behaviour { get; set; }
     }
 
     /// <summary>
@@ -408,23 +408,23 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsHelpPropertiesConfig
     {
-        [JsonProperty("message")]
-        /// <summary>
-        /// Gets or sets the Message
-        /// </summary>
-        public string Message { get; set; }
+		[JsonProperty("message")]
+  /// <summary>
+  /// Gets or sets the Message
+  /// </summary>
+		public string Message { get; set; }
 
-        [JsonProperty("showCallButton")]
-        public bool ShowCallButton { get; set; }
-
-        /// <summary>
+		[JsonProperty("showCallButton")]
+		public bool ShowCallButton { get; set; }
+        
+		/// <summary>
         /// Defaults to "Call Help Desk"
         /// </summary>
-        [JsonProperty("callButtonText")]
-        /// <summary>
-        /// Gets or sets the CallButtonText
-        /// </summary>
-        public string CallButtonText { get; set; }
+		[JsonProperty("callButtonText")]
+  /// <summary>
+  /// Gets or sets the CallButtonText
+  /// </summary>
+		public string CallButtonText { get; set; }
 
         public EssentialsHelpPropertiesConfig()
         {
@@ -437,23 +437,23 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsOneButtonMeetingPropertiesConfig
     {
-        [JsonProperty("enable")]
-        /// <summary>
-        /// Gets or sets the Enable
-        /// </summary>
-        public bool Enable { get; set; }
+		[JsonProperty("enable")]
+  /// <summary>
+  /// Gets or sets the Enable
+  /// </summary>
+		public bool Enable { get; set; }
     }
 
     public class EssentialsRoomAddressPropertiesConfig
     {
-        [JsonProperty("phoneNumber")]
-        public string PhoneNumber { get; set; }
+		[JsonProperty("phoneNumber")]
+		public string PhoneNumber { get; set; }
 
-        [JsonProperty("sipAddress")]
-        /// <summary>
-        /// Gets or sets the SipAddress
-        /// </summary>
-        public string SipAddress { get; set; }
+		[JsonProperty("sipAddress")]
+  /// <summary>
+  /// Gets or sets the SipAddress
+  /// </summary>
+		public string SipAddress { get; set; }
     }
 
 
@@ -462,14 +462,14 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsLogoPropertiesConfig
     {
-        [JsonProperty("type")]
-        /// <summary>
-        /// Gets or sets the Type
-        /// </summary>
-        public string Type { get; set; }
+		[JsonProperty("type")]
+  /// <summary>
+  /// Gets or sets the Type
+  /// </summary>
+		public string Type { get; set; }
 
-        [JsonProperty("url")]
-        public string Url { get; set; }
+		[JsonProperty("url")]
+		public string Url { get; set; }
         /// <summary>
         /// GetLogoUrlLight method
         /// </summary>
@@ -478,7 +478,7 @@ namespace PepperDash.Essentials.Room.Config
             if (Type == "url")
                 return Url;
             if (Type == "system")
-                return string.Format("http://{0}:8080/logo.png",
+                return string.Format("http://{0}:8080/logo.png", 
                     CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
             return null;
         }
@@ -502,22 +502,22 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsRoomOccSensorConfig
     {
-        [JsonProperty("deviceKey")]
-        /// <summary>
-        /// Gets or sets the DeviceKey
-        /// </summary>
-        public string DeviceKey { get; set; }
+		[JsonProperty("deviceKey")]
+  /// <summary>
+  /// Gets or sets the DeviceKey
+  /// </summary>
+		public string DeviceKey { get; set; }
 
-        [JsonProperty("timeoutMinutes")]
-        public int TimeoutMinutes { get; set; }
+		[JsonProperty("timeoutMinutes")]
+		public int TimeoutMinutes { get; set; }
     }
 
-    public class EssentialsRoomTechConfig
-    {
-        [JsonProperty("password")]
-        /// <summary>
-        /// Gets or sets the Password
-        /// </summary>
-        public string Password { get; set; }
-    }
+	public class EssentialsRoomTechConfig
+	{
+		[JsonProperty("password")]
+  /// <summary>
+  /// Gets or sets the Password
+  /// </summary>
+		public string Password { get; set; }
+	}
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs

@@ -5,7 +5,6 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
@@ -53,9 +52,9 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		/// </summary>
 		public event SourceInfoChangeHandler CurrentSourceChange;
 
-		/// <summary>
-		/// Gets or sets the CurrentSourceInfoKey
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the CurrentSourceInfoKey
+  /// </summary>
 		public string CurrentSourceInfoKey { get; set; }
 
 		/// <summary>
@@ -90,32 +89,29 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		/// <inheritdoc/>
 		public Dictionary<eRoutingSignalType, string> CurrentSourceKeys { get; private set; }
 
-		/// <inheritdoc />
-		public event EventHandler CurrentSourcesChanged;
-
 		/// <summary>
 		/// Gets feedback indicating whether the display is currently cooling down after being powered off.
 		/// </summary>
 		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
 
-		/// <summary>
-		/// Gets or sets the IsWarmingUpFeedback
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the IsWarmingUpFeedback
+  /// </summary>
 		public BoolFeedback IsWarmingUpFeedback { get; private set; }
 
-		/// <summary>
-		/// Gets or sets the UsageTracker
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the UsageTracker
+  /// </summary>
 		public UsageTracking UsageTracker { get; set; }
 
-		/// <summary>
-		/// Gets or sets the WarmupTime
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the WarmupTime
+  /// </summary>
 		public uint WarmupTime { get; set; }
 
-		/// <summary>
-		/// Gets or sets the CooldownTime
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the CooldownTime
+  /// </summary>
 		public uint CooldownTime { get; set; }
 
 		/// <summary>
@@ -193,7 +189,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		/// <summary>
 		/// Gets the collection of feedback objects for this display device.
 		/// </summary>
-		/// <inheritdoc />
+  /// <inheritdoc />
 		public virtual FeedbackCollection<Feedback> Feedbacks
 		{
 			get
@@ -382,53 +378,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 			volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
 		}
 
-		/// <inheritdoc />
-		public virtual void SetCurrentSource(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem)
-		{
-			foreach (eRoutingSignalType type in Enum.GetValues(typeof(eRoutingSignalType)))
-			{
-				var flagValue = Convert.ToInt32(type);
-				// Skip if flagValue is 0 or not a power of two (i.e., not a single-bit flag).
-				// (flagValue & (flagValue - 1)) != 0 checks if more than one bit is set.
-				if (flagValue == 0 || (flagValue & (flagValue - 1)) != 0)
-				{
-					this.LogDebug("Skipping {type}", type);
-					continue;
-				}
-
-				this.LogDebug("setting {type}", type);
-
-				if (signalType.HasFlag(type))
-				{
-					UpdateCurrentSources(type, sourceListKey, sourceListItem);
-				}
-			}
-			// Raise the CurrentSourcesChanged event
-			CurrentSourcesChanged?.Invoke(this, EventArgs.Empty);
-		}
-
-		private void UpdateCurrentSources(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem)
-		{
-			if (CurrentSources.ContainsKey(signalType))
-			{
-				CurrentSources[signalType] = sourceListItem;
-			}
-			else
-			{
-				CurrentSources.Add(signalType, sourceListItem);
-			}
-
-			// Update the current source key for the specified signal type
-			if (CurrentSourceKeys.ContainsKey(signalType))
-			{
-				CurrentSourceKeys[signalType] = sourceListKey;
-			}
-			else
-			{
-				CurrentSourceKeys.Add(signalType, sourceListKey);
-			}
-		}
-
 	}
 
 	/// <summary>

src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj

@@ -29,6 +29,6 @@
     <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.133" />
   </ItemGroup>
 </Project>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Linq;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
 using PepperDash.Essentials.Devices.Common.Codec;
+using System;
+using System.Linq;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -29,16 +29,12 @@ namespace PepperDash.Essentials.AppServer.Messengers
             codec.CallStatusChange += Codec_CallStatusChange;
         }
 
-        /// <inheritdoc />
         protected override void RegisterActions()
 
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendAtcFullMessageObject(id));
-
-            AddAction("/audioDialerStatus", (id, content) => SendAtcFullMessageObject(id));
-
+            AddAction("/fullStatus", (id, content) => SendAtcFullMessageObject());
             AddAction("/dial", (id, content) =>
             {
                 var msg = content.ToObject<MobileControlSimpleContent<string>>();
@@ -101,7 +97,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// Helper method to build call status for vtc
         /// </summary>
         /// <returns></returns>
-        private void SendAtcFullMessageObject(string id = null)
+        private void SendAtcFullMessageObject()
         {
             var info = Codec.CodecInfo;
 
@@ -113,7 +109,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 {
                     phoneNumber = info.PhoneNumber
                 }
-            }), id
+            })
             );
         }
     }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
@@ -11,12 +9,12 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// <summary>
     /// Messenger for a CameraBase device
     /// </summary>
-    public class CameraBaseMessenger<T> : MessengerBase where T : IKeyed
+    public class CameraBaseMessenger : MessengerBase
     {
         /// <summary>
         /// Gets or sets the Camera
         /// </summary>
-        public T Camera { get; set; }
+        public CameraBase Camera { get; set; }
 
         /// <summary>
         /// Constructor
@@ -24,13 +22,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <param name="key"></param>
         /// <param name="camera"></param>
         /// <param name="messagePath"></param>
-        public CameraBaseMessenger(string key, T camera, string messagePath)
-            : base(key, messagePath, camera as IKeyName)
+        public CameraBaseMessenger(string key, CameraBase camera, string messagePath)
+            : base(key, messagePath, camera)
         {
-            if (camera == null)
-                throw new ArgumentNullException(nameof(camera));
-
-            Camera = camera;
+            Camera = camera ?? throw new ArgumentNullException("camera");
 
 
             if (Camera is IHasCameraPresets presetsCamera)
@@ -60,9 +55,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendCameraFullMessageObject(id));
-
-            AddAction("/cameraStatus", (id, content) => SendCameraFullMessageObject(id));
+            AddAction("/fullStatus", (id, content) => SendCameraFullMessageObject());
 
 
             if (Camera is IHasCameraPtzControl ptzCamera)
@@ -147,19 +140,17 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
             if (Camera is IHasCameraPresets presetsCamera)
             {
-                AddAction("/recallPreset", (id, content) =>
+                for (int i = 1; i <= 6; i++)
                 {
-                    var msg = content.ToObject<MobileControlSimpleContent<int>>();
+                    var preset = i;
+                    AddAction("/cameraPreset" + i, (id, content) =>
+                    {
+                        var msg = content.ToObject<MobileControlSimpleContent<int>>();
 
-                    presetsCamera.PresetSelect(msg.Value);
-                });
+                        presetsCamera.PresetSelect(msg.Value);
+                    });
 
-                AddAction("/storePreset", (id, content) =>
-                {
-                    var msg = content.ToObject<MobileControlSimpleContent<int>>();
-
-                    presetsCamera.PresetStore(msg.Value, string.Empty);
-                });
+                }
             }
         }
 
@@ -173,54 +164,30 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 return;
             }
 
-            timerHandler(Camera.Key, cameraAction);
+            timerHandler(state.Value, cameraAction);
 
+            cameraAction(state.Value.Equals("true", StringComparison.InvariantCultureIgnoreCase));
         }
 
         /// <summary>
         /// Helper method to update the full status of the camera
         /// </summary>
-        private void SendCameraFullMessageObject(string id = null)
+        private void SendCameraFullMessageObject()
         {
             var presetList = new List<CameraPreset>();
-            CameraCapabilities capabilities = null;
 
             if (Camera is IHasCameraPresets presetsCamera)
                 presetList = presetsCamera.Presets;
 
-            if (Camera is ICameraCapabilities cameraCapabilities)
-                capabilities = new CameraCapabilities
-                {
-                    CanPan = cameraCapabilities.CanPan,
-                    CanTilt = cameraCapabilities.CanTilt,
-                    CanZoom = cameraCapabilities.CanZoom,
-                    CanFocus = cameraCapabilities.CanFocus
-
-                };
-
-            if (Camera is CameraBase cameraBase)
-                capabilities = new CameraCapabilities
-                {
-                    CanPan = cameraBase.CanPan,
-                    CanTilt = cameraBase.CanTilt,
-                    CanZoom = cameraBase.CanZoom,
-                    CanFocus = cameraBase.CanFocus
-                    
-                };
-
-            var message = new CameraStateMessage
+            PostStatusMessage(JToken.FromObject(new
             {
-                CameraManualSupported = Camera is IHasCameraControls,
-                CameraAutoSupported = Camera is IHasCameraAutoMode,
-                CameraOffSupported = Camera is IHasCameraOff,
-                CameraMode = (eCameraControlMode)Enum.Parse(typeof(eCameraControlMode), GetCameraMode(), true),
-                HasPresets = Camera is IHasCameraPresets,
-                Presets = presetList,
-                Capabilities = capabilities,
-                IsFarEnd = Camera is IAmFarEndCamera
-            };
-
-            PostStatusMessage(message, id
+                cameraManualSupported = Camera is IHasCameraControls,
+                cameraAutoSupported = Camera is IHasCameraAutoMode,
+                cameraOffSupported = Camera is IHasCameraOff,
+                cameraMode = GetCameraMode(),
+                hasPresets = Camera is IHasCameraPresets,
+                presets = presetList
+            })
             );
         }
 
@@ -240,59 +207,4 @@ namespace PepperDash.Essentials.AppServer.Messengers
             return m;
         }
     }
-
-    /// <summary>
-    /// State message for a camera device
-    /// </summary>
-    public class CameraStateMessage : DeviceStateMessageBase
-    {
-        /// <summary>
-        /// Indicates whether the camera supports manual control
-        /// </summary>
-        [JsonProperty("cameraManualSupported", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CameraManualSupported { get; set; }
-
-        /// <summary>
-        /// Indicates whether the camera supports auto control
-        /// </summary>
-        [JsonProperty("cameraAutoSupported", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CameraAutoSupported { get; set; }
-
-        /// <summary>
-        /// Indicates whether the camera supports off control
-        /// </summary>
-        [JsonProperty("cameraOffSupported", NullValueHandling = NullValueHandling.Ignore)]
-        public bool CameraOffSupported { get; set; }
-
-        /// <summary>
-        /// Indicates the current camera control mode
-        /// </summary>
-        [JsonProperty("cameraMode", NullValueHandling = NullValueHandling.Ignore)]
-        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-        public eCameraControlMode CameraMode { get; set; }
-
-        /// <summary>
-        /// Indicates whether the camera has presets
-        /// </summary>
-        [JsonProperty("hasPresets", NullValueHandling = NullValueHandling.Ignore)]
-        public bool HasPresets { get; set; }
-
-        /// <summary>
-        /// List of presets if the camera supports them
-        /// </summary>
-        [JsonProperty("presets", NullValueHandling = NullValueHandling.Ignore)]
-        public List<CameraPreset> Presets { get; set; }
-
-        /// <summary>
-        /// Indicates the capabilities of the camera
-        /// </summary>
-        [JsonProperty("capabilities", NullValueHandling = NullValueHandling.Ignore)]
-        public CameraCapabilities Capabilities { get; set; }
-
-        /// <summary>
-        /// Indicates whether the camera is a far end camera
-        /// </summary>
-        [JsonProperty("isFarEnd", NullValueHandling = NullValueHandling.Ignore)]
-        public bool IsFarEnd { get; set; }
-    }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CurrentSourcesMessenger.cs

@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Routing;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-  /// <summary>
-  /// Represents a IHasCurrentSourceInfoMessenger
-  /// </summary>
-  public class CurrentSourcesMessenger : MessengerBase
-  {
-    private readonly ICurrentSources sourceDevice;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CurrentSourcesMessenger"/> class.
-    /// </summary>
-    /// <param name="key">The key.</param>
-    /// <param name="messagePath">The message path.</param>
-    /// <param name="device">The device.</param>
-    public CurrentSourcesMessenger(string key, string messagePath, ICurrentSources device) : base(key, messagePath, device as IKeyName)
-    {
-      sourceDevice = device;
-    }
-
-    /// <summary>
-    /// Registers the actions for the messenger.
-    /// </summary>
-    protected override void RegisterActions()
-    {
-      base.RegisterActions();
-
-      AddAction("/fullStatus", (id, content) => SendCurrentSourceStatus(id));
-
-      AddAction("/currentSourceStatus", (id, content) => SendCurrentSourceStatus(id));
-
-      sourceDevice.CurrentSourcesChanged += (sender, e) =>
-      {
-        PostStatusMessage(JToken.FromObject(new
-        {
-          currentSourceKeys = sourceDevice.CurrentSourceKeys,
-          currentSources = sourceDevice.CurrentSources
-        }));
-      };
-    }
-
-    private void SendCurrentSourceStatus(string id = null)
-    {
-      var message = new CurrentSourcesStateMessage
-      {
-        CurrentSourceKeys = sourceDevice.CurrentSourceKeys,
-        CurrentSources = sourceDevice.CurrentSources
-      };
-
-      PostStatusMessage(message, id);
-    }
-  }
-
-  /// <summary>
-  /// Represents a CurrentSourcesStateMessage
-  /// </summary>
-  public class CurrentSourcesStateMessage : DeviceStateMessageBase
-  {
-
-    /// <summary>
-    /// Gets or sets the CurrentSourceKey
-    /// </summary>
-    [JsonProperty("currentSourceKeys", NullValueHandling = NullValueHandling.Ignore)]
-    public Dictionary<eRoutingSignalType, string> CurrentSourceKeys { get; set; }
-
-
-    /// <summary>
-    /// Gets or sets the CurrentSource
-    /// </summary>
-    [JsonProperty("currentSources")]
-    public Dictionary<eRoutingSignalType, SourceListItem> CurrentSources { get; set; }
-  }
-}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceEventMessageBase.cs

@@ -1,17 +0,0 @@
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-  /// <summary>
-  /// Base class for event messages that include the type of message and an event type
-  /// </summary>
-  public abstract class DeviceEventMessageBase : DeviceMessageBase
-  {
-    /// <summary>
-    /// The event type
-    /// </summary>
-    [JsonProperty("eventType")]
-    public string EventType { get; set; }
-  }
-
-}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceInfoMessenger.cs

@@ -1,8 +1,8 @@
-using System.Timers;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.DeviceInfo;
+using System.Timers;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -67,19 +67,12 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 debounceTimer.Start();
             };
 
-            AddAction("/fullStatus", (id, context) => SendFullStatus(id));
-
-            AddAction("/deviceInfo", (id, content) => SendFullStatus(id));
-
-            AddAction("/update", (id, context) => _deviceInfoProvider.UpdateDeviceInfo());
-        }
-
-        private void SendFullStatus(string id = null)
-        {
-            PostStatusMessage(new DeviceInfoStateMessage
+            AddAction("/fullStatus", (id, context) => PostStatusMessage(new DeviceInfoStateMessage
             {
                 DeviceInfo = _deviceInfoProvider.DeviceInfo
-            }, id);
+            }));
+
+            AddAction("/update", (id, context) => _deviceInfoProvider.UpdateDeviceInfo());
         }
     }
 

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceMessageBase.cs

@@ -1,39 +0,0 @@
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-  /// <summary>
-  /// Base class for device messages that include the type of message
-  /// </summary>
-  public abstract class DeviceMessageBase
-  {
-    /// <summary>
-    /// The device key
-    /// </summary>
-    [JsonProperty("key")]
-    /// <summary>
-    /// Gets or sets the Key
-    /// </summary>
-    public string Key { get; set; }
-
-    /// <summary>
-    /// The device name
-    /// </summary>
-    [JsonProperty("name")]
-    public string Name { get; set; }
-
-    /// <summary>
-    /// The type of the message class
-    /// </summary>
-    [JsonProperty("messageType")]
-    public string MessageType => GetType().Name;
-
-    /// <summary>
-    /// Gets or sets the MessageBasePath
-    /// </summary>
-    [JsonProperty("messageBasePath")]
-
-    public string MessageBasePath { get; set; }
-  }
-
-}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Presets;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -16,24 +16,18 @@ namespace PepperDash.Essentials.AppServer.Messengers
     {
         private readonly ITvPresetsProvider _presetsDevice;
 
-        /// <summary>
-        /// Constructor for DevicePresetsModelMessenger
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="messagePath">The message path.</param>
-        /// <param name="presetsDevice">The presets device.</param>
         public DevicePresetsModelMessenger(string key, string messagePath, ITvPresetsProvider presetsDevice)
             : base(key, messagePath, presetsDevice as Device)
         {
             _presetsDevice = presetsDevice;
         }
 
-        private void SendPresets(string id = null)
+        private void SendPresets()
         {
             PostStatusMessage(new PresetStateMessage
             {
                 Favorites = _presetsDevice.TvPresets.PresetsList
-            }, id);
+            });
         }
 
         private void RecallPreset(ISetTopBoxNumericKeypad device, string channel)
@@ -49,7 +43,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         #region Overrides of MessengerBase
 
-        /// <inheritdoc />
         protected override void RegisterActions()
 
         {
@@ -58,7 +51,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 this.LogInformation("getting full status for client {id}", id);
                 try
                 {
-                    SendPresets(id);
+                    SendPresets();
                 }
                 catch (Exception ex)
                 {
@@ -66,8 +59,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 }
             });
 
-            AddAction("/presetsStatus", (id, content) => SendPresets(id));
-
             AddAction("/recall", (id, content) =>
             {
                 var p = content.ToObject<PresetChannelMessage>();
@@ -100,16 +91,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class PresetChannelMessage
     {
+        [JsonProperty("preset")]
         /// <summary>
         /// Gets or sets the Preset
         /// </summary>
-        [JsonProperty("preset")]
         public PresetChannel Preset;
 
+        [JsonProperty("deviceKey")]
         /// <summary>
         /// Gets or sets the DeviceKey
         /// </summary>
-        [JsonProperty("deviceKey")]
         public string DeviceKey;
     }
 
@@ -118,11 +109,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class PresetStateMessage : DeviceStateMessageBase
     {
-
+        [JsonProperty("favorites", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Favorites
         /// </summary>
-        [JsonProperty("favorites", NullValueHandling = NullValueHandling.Ignore)]
         public List<PresetChannel> Favorites { get; set; } = new List<PresetChannel>();
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs

@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-  /// <summary>
-  /// Represents a DeviceStateMessageBase
-  /// </summary>
-  public class DeviceStateMessageBase : DeviceMessageBase
-  {
-    /// <summary>
-    /// The interfaces implmented by the device sending the messsage
-    /// </summary>
-    [JsonProperty("interfaces")]
-    public List<string> Interfaces { get; private set; }
-
-    /// <summary>
-    /// Sets the interfaces implemented by the device sending the message
-    /// </summary>
-    /// <param name="interfaces"></param>
-    public void SetInterfaces(List<string> interfaces)
-    {
-      Interfaces = interfaces;
-    }
-  }
-
-}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs

@@ -1,10 +1,9 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
-using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
+using System;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -13,46 +12,35 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class DeviceVolumeMessenger : MessengerBase
     {
-        private readonly IBasicVolumeControls device;
+        private readonly IBasicVolumeWithFeedback _localDevice;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeviceVolumeMessenger"/> class.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="messagePath">The message path.</param>
-        /// <param name="device">The device.</param>
-        public DeviceVolumeMessenger(string key, string messagePath, IBasicVolumeControls device)
+        public DeviceVolumeMessenger(string key, string messagePath, IBasicVolumeWithFeedback device)
             : base(key, messagePath, device as IKeyName)
         {
-            this.device = device;
+            _localDevice = device;
         }
 
-        private void SendStatus(string id = null)
+        private void SendStatus()
         {
             try
             {
-                if (!(device is IBasicVolumeWithFeedback feedbackDevice))
-                {
-                    return;
-                }
-
                 var messageObj = new VolumeStateMessage
                 {
                     Volume = new Volume
                     {
-                        Level = feedbackDevice?.VolumeLevelFeedback.IntValue ?? -1,
-                        Muted = feedbackDevice?.MuteFeedback.BoolValue ?? false,
+                        Level = _localDevice?.VolumeLevelFeedback.IntValue ?? -1,
+                        Muted = _localDevice?.MuteFeedback.BoolValue ?? false,
                         HasMute = true,  // assume all devices have mute for now
                     }
                 };
 
-                if (device is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
+                if (_localDevice is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
                 {
                     messageObj.Volume.RawValue = volumeAdvanced.RawVolumeLevel.ToString();
                     messageObj.Volume.Units = volumeAdvanced.Units;
                 }
 
-                PostStatusMessage(messageObj, id);
+                PostStatusMessage(messageObj);
             }
             catch (Exception ex)
             {
@@ -62,26 +50,47 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         #region Overrides of MessengerBase
 
-        /// <inheritdoc />
+
         protected override void RegisterActions()
         {
-            AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
-                        {
-                            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b);
-                            try
-                            {
-                                device.VolumeUp(b);
-                            }
-                            catch (Exception ex)
-                            {
-                                Debug.LogMessage(ex, "Got exception during volume up: {Exception}", null, ex);
-                            }
-                        }));
+            AddAction("/fullStatus", (id, content) => SendStatus());
+
+            AddAction("/level", (id, content) =>
+            {
+                var volume = content.ToObject<MobileControlSimpleContent<ushort>>();
+
+                _localDevice.SetVolume(volume.Value);
+            });
 
             AddAction("/muteToggle", (id, content) =>
-                        {
-                            device.MuteToggle();
-                        });
+            {
+                _localDevice.MuteToggle();
+            });
+
+            AddAction("/muteOn", (id, content) =>
+            {
+                _localDevice.MuteOn();
+            });
+
+            AddAction("/muteOff", (id, content) =>
+            {
+                _localDevice.MuteOff();
+            });
+
+            AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b);
+                try
+                {
+                    _localDevice.VolumeUp(b);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogMessage(ex, "Got exception during volume up: {Exception}", null, ex);
+                }
+            }));
+
+
 
             AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
             {
@@ -89,7 +98,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
                 try
                 {
-                    device.VolumeDown(b);
+                    _localDevice.VolumeDown(b);
                 }
                 catch (Exception ex)
                 {
@@ -97,38 +106,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 }
             }));
 
-            if (!(device is IBasicVolumeWithFeedback feedback))
-            {
-                this.LogDebug("Skipping feedback methods for {deviceKey}", (device as IKeyName)?.Key);
-                return;
-            }
-
-            AddAction("/fullStatus", (id, content) => SendStatus(id));
-
-            AddAction("/volumeStatus", (id, content) => SendStatus(id));
-
-            AddAction("/level", (id, content) =>
-            {
-                var volume = content.ToObject<MobileControlSimpleContent<ushort>>();
-
-                feedback.SetVolume(volume.Value);
-            });
-
-
-
-            AddAction("/muteOn", (id, content) =>
-            {
-                feedback.MuteOn();
-            });
-
-            AddAction("/muteOff", (id, content) =>
-            {
-                feedback.MuteOff();
-            });
-
-
-
-            feedback.MuteFeedback.OutputChange += (sender, args) =>
+            _localDevice.MuteFeedback.OutputChange += (sender, args) =>
             {
                 PostStatusMessage(JToken.FromObject(
                         new
@@ -141,10 +119,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 );
             };
 
-            feedback.VolumeLevelFeedback.OutputChange += (sender, args) =>
+            _localDevice.VolumeLevelFeedback.OutputChange += (sender, args) =>
             {
                 var rawValue = "";
-                if (feedback is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
+                if (_localDevice is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
                 {
                     rawValue = volumeAdvanced.RawVolumeLevel.ToString();
                 }
@@ -160,6 +138,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
                 PostStatusMessage(JToken.FromObject(message));
             };
+
+
         }
 
         #endregion

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs

@@ -7,29 +7,22 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class GenericMessenger : MessengerBase
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericMessenger"/> class.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="device">The device.</param>
-        /// <param name="messagePath">The message path.</param>
         public GenericMessenger(string key, EssentialsDevice device, string messagePath) : base(key, messagePath, device)
         {
         }
 
-        /// <inheritdoc />
         protected override void RegisterActions()
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             var state = new DeviceStateMessageBase();
 
-            PostStatusMessage(state, id);
+            PostStatusMessage(state);
         }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IBasicVideoMuteWithFeedbackMessenger.cs

@@ -1,86 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    /// <summary>
-    /// Represents a IBasicVideoMuteWithFeedbackMessenger
-    /// </summary>
-    public class IBasicVideoMuteWithFeedbackMessenger : MessengerBase
-    {
-        private readonly IBasicVideoMuteWithFeedback device;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IBasicVideoMuteWithFeedbackMessenger"/> class.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="messagePath"></param>
-        /// <param name="device"></param>
-        public IBasicVideoMuteWithFeedbackMessenger(string key, string messagePath, IBasicVideoMuteWithFeedback device)
-            : base(key, messagePath, device as IKeyName)
-        {
-            this.device = device;
-        }
-
-        /// <summary>
-        /// SendFullStatus method
-        /// </summary>
-        public void SendFullStatus(string id = null)
-        {
-            var messageObj = new IBasicVideoMuteWithFeedbackMessage
-            {
-                VideoMuteState = device.VideoMuteIsOn.BoolValue
-            };
-
-            PostStatusMessage(messageObj, id);
-        }
-
-        /// <inheritdoc />
-        protected override void RegisterActions()
-        {
-            base.RegisterActions();
-
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/videoMuteStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/videoMuteToggle", (id, content) =>
-            {
-                device.VideoMuteToggle();
-            });
-
-            AddAction("/videoMuteOn", (id, content) =>
-            {
-                device.VideoMuteOn();
-            });
-
-            AddAction("/videoMuteOff", (id, content) =>
-            {
-                device.VideoMuteOff();
-            });
-
-            device.VideoMuteIsOn.OutputChange += VideoMuteIsOnFeedback_OutputChange;
-        }
-
-        private void VideoMuteIsOnFeedback_OutputChange(object sender, FeedbackEventArgs args)
-        {
-            PostStatusMessage(JToken.FromObject(new
-            {
-                videoMuteState = args.BoolValue
-            })
-            );
-        }
-    }
-
-    /// <summary>
-    /// Represents a IBasicVideoMuteWithFeedbackMessage
-    /// </summary>
-    public class IBasicVideoMuteWithFeedbackMessage : DeviceStateMessageBase
-    {
-        [JsonProperty("videoMuteState")]
-        public bool VideoMuteState { get; set; }
-    }
-}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ICommunicationMonitorMessenger.cs

@@ -24,12 +24,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
             AddAction("/fullStatus", (id, content) =>
             {
-                SendFullStatus(id);
-            });
-
-            AddAction("/commStatus", (id, content) =>
-            {
-                SendFullStatus(id);
+                PostStatusMessage(new CommunicationMonitorState
+                {
+                    CommunicationMonitor = new CommunicationMonitorProps
+                    {
+                        IsOnline = _communicationMonitor.CommunicationMonitor.IsOnline,
+                        Status = _communicationMonitor.CommunicationMonitor.Status
+                    }
+                });
             });
 
             _communicationMonitor.CommunicationMonitor.StatusChange += (sender, args) =>
@@ -44,18 +46,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 }));
             };
         }
-
-        private void SendFullStatus(string id = null)
-        {
-            PostStatusMessage(new CommunicationMonitorState
-            {
-                CommunicationMonitor = new CommunicationMonitorProps
-                {
-                    IsOnline = _communicationMonitor.CommunicationMonitor.IsOnline,
-                    Status = _communicationMonitor.CommunicationMonitor.Status
-                },
-            }, id);
-        }
     }
 
     /// <summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IDspPresetsMessenger.cs

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -22,9 +22,15 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) =>
+            {
+                var message = new IHasDspPresetsStateMessage
+                {
+                    Presets = device.Presets
+                };
 
-            AddAction("/dspPresetStatus", (id, content) => SendFullStatus(id));
+                PostStatusMessage(message);
+            });
 
             AddAction("/recallPreset", (id, content) =>
             {
@@ -37,16 +43,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 }
             });
         }
-
-        private void SendFullStatus(string id = null)
-        {
-            var message = new IHasDspPresetsStateMessage
-            {
-                Presets = device.Presets
-            };
-
-            PostStatusMessage(message, id);
-        }
     }
 
     /// <summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -46,9 +46,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// partition states.</remarks>
         protected override void RegisterActions()
         {
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/combinerStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
 
             AddAction("/setAutoMode", (id, content) =>
             {
@@ -122,7 +120,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             }
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             try
             {
@@ -143,7 +141,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                     Partitions = _roomCombiner.Partitions
                 };
 
-                PostStatusMessage(message, id);
+                PostStatusMessage(message);
             }
             catch (Exception e)
             {

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCamerasMessenger.cs

@@ -1,14 +1,17 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
     /// <summary>
     /// Messenger for devices that implement the IHasCameras interface.
     /// </summary>
-    [Obsolete("Use IHasCamerasWithControlsMessenger instead. This class will be removed in a future version")]
     public class IHasCamerasMessenger : MessengerBase
     {
         /// <summary>
@@ -23,7 +26,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <param name="cameraController"></param>
         /// <param name="messagePath"></param>
         /// <exception cref="ArgumentNullException"></exception>
-        public IHasCamerasMessenger(string key, string messagePath, IHasCameras cameraController)
+        public IHasCamerasMessenger(string key, string messagePath , IHasCameras cameraController)
             : base(key, messagePath, cameraController)
         {
             CameraController = cameraController ?? throw new ArgumentNullException("cameraController");
@@ -46,9 +49,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, context) => SendFullStatus(id));
-
-            AddAction("/cameraListStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, context) =>
+            {
+                SendFullStatus(id);
+            });
 
             AddAction("/selectCamera", (id, content) =>
             {

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCamerasWithControlMessenger.cs

@@ -1,137 +0,0 @@
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Logging;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.Cameras;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    /// <summary>
-    /// Messenger for devices that implement the IHasCameras interface.
-    /// </summary>
-    public class IHasCamerasWithControlMessenger : MessengerBase
-    {
-        /// <summary>
-        /// Device being bridged that implements IHasCameras interface.
-        /// </summary>
-        public IHasCamerasWithControls CameraController { get; private set; }
-
-        /// <summary>
-        /// Messenger for devices that implement IHasCameras interface.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="cameraController"></param>
-        /// <param name="messagePath"></param>
-        /// <exception cref="ArgumentNullException"></exception>
-        public IHasCamerasWithControlMessenger(string key, string messagePath, IHasCamerasWithControls cameraController)
-            : base(key, messagePath, cameraController)
-        {
-            CameraController = cameraController ?? throw new ArgumentNullException("cameraController");
-            CameraController.CameraSelected += CameraController_CameraSelected;
-        }
-
-        private void CameraController_CameraSelected(object sender, CameraSelectedEventArgs<IHasCameraControls> e)
-        {
-            var selectedCamera = new KeyName
-            {
-                Key = e.SelectedCamera.Key,
-                Name = e.SelectedCamera.Name
-            };
-
-            PostStatusMessage(new IHasCamerasWithControlsStateMessage
-            {
-                SelectedCamera = selectedCamera
-            });
-        }
-
-        /// <summary>
-        /// Registers the actions for this messenger.
-        /// </summary>
-        /// <exception cref="ArgumentException"></exception>
-        protected override void RegisterActions()
-        {
-            base.RegisterActions();
-
-            AddAction("/fullStatus", (id, context) => SendFullStatus(id));
-
-            AddAction("/cameraListStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/selectCamera", (id, content) =>
-            {
-                var cameraKey = content?.ToObject<string>();
-
-                if (!string.IsNullOrEmpty(cameraKey))
-                {
-                    CameraController.SelectCamera(cameraKey);
-                }
-                else
-                {
-                    throw new ArgumentException("Content must be a string representing the camera key");
-                }
-            });
-        }
-
-        private void SendFullStatus(string clientId)
-        {
-            var cameraList = new List<IKeyName>();
-            KeyName selectedCamera = null;
-
-            foreach (var cam in CameraController.Cameras)
-            {
-                cameraList.Add(new KeyName{
-                    Key = cam.Key,
-                    Name = cam.Name
-                });
-            }
-
-            if (CameraController.SelectedCamera != null)
-            {
-                selectedCamera = new KeyName
-                {
-                    Key = CameraController.SelectedCamera.Key,
-                    Name = CameraController.SelectedCamera.Name
-                };
-            }
-
-            var state = new IHasCamerasWithControlsStateMessage
-            {
-                CameraList = cameraList,
-                SelectedCamera = selectedCamera
-            };
-
-            PostStatusMessage(state, clientId);
-        }
-    }
-
-    /// <summary>
-    /// State message for devices that implement the IHasCameras interface.
-    /// </summary>
-    public class IHasCamerasWithControlsStateMessage : DeviceStateMessageBase
-    {
-        /// <summary>
-        /// List of cameras available in the device.
-        /// </summary>
-        [JsonProperty("cameraList", NullValueHandling = NullValueHandling.Ignore)]
-        public List<IKeyName> CameraList { get; set; }
-
-        /// <summary>
-        /// The currently selected camera on the device.
-        /// </summary>
-        [JsonProperty("selectedCamera", NullValueHandling = NullValueHandling.Ignore)]
-        public IKeyName SelectedCamera { get; set; }
-    }
-
-    class KeyName : IKeyName
-    {
-        public string Key { get; set; }
-        public string Name { get; set; }
-        public KeyName()
-        {
-            Key = "";
-            Name = "";
-        }
-    }
-}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCurrentSourceInfoMessenger.cs

@@ -11,7 +11,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
     public class IHasCurrentSourceInfoMessenger : MessengerBase
     {
         private readonly IHasCurrentSourceInfoChange sourceDevice;
-
         public IHasCurrentSourceInfoMessenger(string key, string messagePath, IHasCurrentSourceInfoChange device) : base(key, messagePath, device as IKeyName)
         {
             sourceDevice = device;
@@ -21,9 +20,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) =>
+            {
+                var message = new CurrentSourceStateMessage
+                {
+                    CurrentSourceKey = sourceDevice.CurrentSourceInfoKey,
+                    CurrentSource = sourceDevice.CurrentSourceInfo
+                };
 
-            AddAction("/currentSourceInfoStatus", (id, content) => SendFullStatus(id));
+                PostStatusMessage(message);
+            });
 
             sourceDevice.CurrentSourceChange += (sender, e) =>
             {
@@ -41,17 +47,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 }
             };
         }
-
-        private void SendFullStatus(string id = null)
-        {
-            var message = new CurrentSourceStateMessage
-            {
-                CurrentSourceKey = sourceDevice.CurrentSourceInfoKey,
-                CurrentSource = sourceDevice.CurrentSourceInfo
-            };
-
-            PostStatusMessage(message, id);
-        }
     }
 
     /// <summary>
@@ -59,18 +54,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class CurrentSourceStateMessage : DeviceStateMessageBase
     {
-
+        [JsonProperty("currentSourceKey", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the CurrentSourceKey
         /// </summary>
-        [JsonProperty("currentSourceKey", NullValueHandling = NullValueHandling.Ignore)]
         public string CurrentSourceKey { get; set; }
 
-
+        [JsonProperty("currentSource")]
         /// <summary>
         /// Gets or sets the CurrentSource
         /// </summary>
-        [JsonProperty("currentSource")]
         public SourceListItem CurrentSource { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasInputsMessenger.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -11,8 +11,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// Represents a IHasInputsMessenger
     /// </summary>
     public class IHasInputsMessenger<TKey> : MessengerBase
-    {
-        private readonly IHasInputs<TKey> itemDevice;
+    {        
+        private readonly IHasInputs<TKey> itemDevice;        
 
 
         /// <summary>
@@ -23,16 +23,17 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <param name="device"></param>
         public IHasInputsMessenger(string key, string messagePath, IHasInputs<TKey> device) : base(key, messagePath, device)
         {
-            itemDevice = device;
+            itemDevice = device;            
         }
 
         protected override void RegisterActions()
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, context) => SendFullStatus(id));
-
-            AddAction("/inputStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, context) =>
+            {
+                SendFullStatus();
+            });
 
             itemDevice.Inputs.ItemsUpdated += (sender, args) =>
             {
@@ -61,7 +62,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             }
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             try
             {
@@ -76,7 +77,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                     }
                 };
 
-                PostStatusMessage(stateObject, id);
+                PostStatusMessage(stateObject);
             }
             catch (Exception e)
             {

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasPowerControlWithFeedbackMessenger.cs

@@ -12,12 +12,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
     {
         private readonly IHasPowerControlWithFeedback _powerControl;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IHasPowerControlWithFeedbackMessenger"/> class.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="messagePath">The message path.</param>
-        /// <param name="powerControl">The power control device</param>
         public IHasPowerControlWithFeedbackMessenger(string key, string messagePath, IHasPowerControlWithFeedback powerControl)
             : base(key, messagePath, powerControl as IKeyName)
         {
@@ -27,24 +21,21 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <summary>
         /// SendFullStatus method
         /// </summary>
-        public void SendFullStatus(string id = null)
+        public void SendFullStatus()
         {
             var messageObj = new PowerControlWithFeedbackStateMessage
             {
                 PowerState = _powerControl.PowerIsOnFeedback.BoolValue
             };
 
-            PostStatusMessage(messageObj, id);
+            PostStatusMessage(messageObj);
         }
 
-        /// <inheritdoc />
         protected override void RegisterActions()
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/powerStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
 
             _powerControl.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange; ;
         }
@@ -64,9 +55,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class PowerControlWithFeedbackStateMessage : DeviceStateMessageBase
     {
-        /// <summary>
-        /// Power State
-        /// </summary>
         [JsonProperty("powerState", NullValueHandling = NullValueHandling.Ignore)]
         public bool? PowerState { get; set; }
     }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Devices.Common.Codec;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -27,9 +27,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         protected override void RegisterActions()
         {
-            AddAction("/schedule/fullStatus", (id, content) => SendFullScheduleObject(id));
-
-            AddAction("/schedule/status", (id, content) => SendFullScheduleObject(id));
+            AddAction("/schedule/fullStatus", (id, content) => SendFullScheduleObject());
         }
 
         private void CodecSchedule_MeetingEventChange(object sender, MeetingEventArgs e)
@@ -53,13 +51,13 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <summary>
         /// Helper method to send the full schedule data
         /// </summary>
-        private void SendFullScheduleObject(string id = null)
+        private void SendFullScheduleObject()
         {
             PostStatusMessage(new FullScheduleMessage
             {
                 Meetings = ScheduleSource.CodecSchedule.Meetings,
                 MeetingWarningMinutes = ScheduleSource.CodecSchedule.MeetingWarningMinutes
-            }, id);
+            });
         }
     }
 
@@ -68,18 +66,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class FullScheduleMessage : DeviceStateMessageBase
     {
-
+        [JsonProperty("meetings", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Meetings
         /// </summary>
-        [JsonProperty("meetings", NullValueHandling = NullValueHandling.Ignore)]
         public List<Meeting> Meetings { get; set; }
 
-
+        [JsonProperty("meetingWarningMinutes", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the MeetingWarningMinutes
         /// </summary>
-        [JsonProperty("meetingWarningMinutes", NullValueHandling = NullValueHandling.Ignore)]
         public int MeetingWarningMinutes { get; set; }
     }
 
@@ -88,11 +84,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class MeetingChangeMessage
     {
-
+        [JsonProperty("meetingChange", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the MeetingChange
         /// </summary>
-        [JsonProperty("meetingChange", NullValueHandling = NullValueHandling.Ignore)]
         public MeetingChange MeetingChange { get; set; }
     }
 
@@ -101,18 +96,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class MeetingChange
     {
-
+        [JsonProperty("changeType", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the ChangeType
         /// </summary>
-        [JsonProperty("changeType", NullValueHandling = NullValueHandling.Ignore)]
         public string ChangeType { get; set; }
 
-
+        [JsonProperty("meeting", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Meeting
         /// </summary>
-        [JsonProperty("meeting", NullValueHandling = NullValueHandling.Ignore)]
         public Meeting Meeting { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHumiditySensor.cs

@@ -1,7 +1,7 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -22,21 +22,19 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/humidityStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
 
             device.HumidityFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>((o, a) => SendFullStatus());
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             var state = new IHumiditySensorStateMessage
             {
                 Humidity = string.Format("{0}%", device.HumidityFeedback.UShortValue)
             };
 
-            PostStatusMessage(state, id);
+            PostStatusMessage(state);
         }
     }
 
@@ -45,11 +43,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class IHumiditySensorStateMessage : DeviceStateMessageBase
     {
-
+        [JsonProperty("humidity")]
         /// <summary>
         /// Gets or sets the Humidity
         /// </summary>
-        [JsonProperty("humidity")]
         public string Humidity { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -13,7 +13,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
     public class ILevelControlsMessenger : MessengerBase
     {
         private ILevelControls levelControlsDevice;
-
         public ILevelControlsMessenger(string key, string messagePath, ILevelControls device) : base(key, messagePath, device as IKeyName)
         {
             levelControlsDevice = device;
@@ -23,9 +22,15 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, context) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, context) =>
+            {
+                var message = new LevelControlStateMessage
+                {
+                    Levels = levelControlsDevice.LevelControlPoints.ToDictionary(kv => kv.Key, kv => new Volume { Level = kv.Value.VolumeLevelFeedback.IntValue, Muted = kv.Value.MuteFeedback.BoolValue })
+                };
 
-            AddAction("/levelStats", (id, content) => SendFullStatus(id));
+                PostStatusMessage(message);
+            });
 
             foreach (var levelControl in levelControlsDevice.LevelControlPoints)
             {
@@ -70,16 +75,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 }));
             }
         }
-
-        private void SendFullStatus(string id = null)
-        {
-            var message = new LevelControlStateMessage
-            {
-                Levels = levelControlsDevice.LevelControlPoints.ToDictionary(kv => kv.Key, kv => new Volume { Level = kv.Value.VolumeLevelFeedback.IntValue, Muted = kv.Value.MuteFeedback.BoolValue })
-            };
-
-            PostStatusMessage(message, id);
-        }
     }
 
     /// <summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs

@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -25,9 +25,25 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) =>
+            {
+                try
+                {
+                    Debug.LogMessage(LogEventLevel.Verbose, "InputCount: {inputCount}, OutputCount: {outputCount}", this, matrixDevice.InputSlots.Count, matrixDevice.OutputSlots.Count);
+                    var message = new MatrixStateMessage
+                    {
+                        Outputs = matrixDevice.OutputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingOutput(kvp.Value)),
+                        Inputs = matrixDevice.InputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingInput(kvp.Value)),
+                    };
 
-            AddAction("/matrixStatus", (id, content) => SendFullStatus(id));
+
+                    PostStatusMessage(message);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogMessage(e, "Exception Getting full status: {@exception}", this, e);
+                }
+            });
 
             AddAction("/route", (id, content) =>
             {
@@ -64,26 +80,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 };
             }
         }
-
-        private void SendFullStatus(string id = null)
-        {
-            try
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, "InputCount: {inputCount}, OutputCount: {outputCount}", this, matrixDevice.InputSlots.Count, matrixDevice.OutputSlots.Count);
-                var message = new MatrixStateMessage
-                {
-                    Outputs = matrixDevice.OutputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingOutput(kvp.Value)),
-                    Inputs = matrixDevice.InputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingInput(kvp.Value)),
-                };
-
-
-                PostStatusMessage(message, id);
-            }
-            catch (Exception e)
-            {
-                Debug.LogMessage(e, "Exception Getting full status: {@exception}", this, e);
-            }
-        }
     }
 
     /// <summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IProjectorScreenLiftControlMessenger.cs

@@ -1,9 +1,9 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -14,28 +14,17 @@ namespace PepperDash.Essentials.AppServer.Messengers
     {
         private readonly IProjectorScreenLiftControl device;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IProjectorScreenLiftControlMessenger"/> class.
-        /// </summary>
-        /// <param name="key">message key</param>
-        /// <param name="messagePath">message path</param>
-        /// <param name="screenLiftDevice">screen lift device</param>
         public IProjectorScreenLiftControlMessenger(string key, string messagePath, IProjectorScreenLiftControl screenLiftDevice)
             : base(key, messagePath, screenLiftDevice as IKeyName)
         {
             device = screenLiftDevice;
         }
 
-        /// <summary>
-        /// Registers the actions for the messenger.
-        /// </summary>
         protected override void RegisterActions()
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/screenliftStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
 
             AddAction("/raise", (id, content) =>
             {
@@ -64,7 +53,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             PostStatusMessage(JToken.FromObject(state));
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             var state = new ScreenLiftStateMessage
             {
@@ -73,7 +62,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 DisplayDeviceKey = device.DisplayDeviceKey
             };
 
-            PostStatusMessage(state, id);
+            PostStatusMessage(state);
         }
     }
 
@@ -82,23 +71,20 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class ScreenLiftStateMessage : DeviceStateMessageBase
     {
-        /// <summary>
-        /// Gets or sets the InUpPosition
-        /// </summary>
         [JsonProperty("inUpPosition", NullValueHandling = NullValueHandling.Ignore)]
         public bool? InUpPosition { get; set; }
 
+        [JsonProperty("displayDeviceKey", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the DisplayDeviceKey
         /// </summary>
-        [JsonProperty("displayDeviceKey", NullValueHandling = NullValueHandling.Ignore)]
         public string DisplayDeviceKey { get; set; }
 
+        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
-        [JsonConverter(typeof(StringEnumConverter))]
-        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
         public eScreenLiftControlType Type { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs

@@ -1,8 +1,8 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
+using System;
 
 
 namespace PepperDash.Essentials.AppServer.Messengers
@@ -36,9 +36,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         protected override void RegisterActions()
         {
-            AddAction("/fullStatus", (id, content) => SendRoutingFullMessageObject(id));
-
-            AddAction("/routingStatus", (id, content) => SendRoutingFullMessageObject(id));
+            AddAction("/fullStatus", (id, content) => SendRoutingFullMessageObject());
 
             AddAction("/source", (id, content) =>
                 {
@@ -64,7 +62,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <summary>
         /// Helper method to update full status of the routing device
         /// </summary>
-        private void SendRoutingFullMessageObject(string id = null)
+        private void SendRoutingFullMessageObject()
         {
             if (RoutingDevice is IRoutingSink sinkDevice)
             {
@@ -86,10 +84,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class RoutingStateMessage : DeviceStateMessageBase
     {
+        [JsonProperty("selectedSourceKey")]
         /// <summary>
         /// Gets or sets the SelectedSourceKey
         /// </summary>
-        [JsonProperty("selectedSourceKey")]
         public string SelectedSourceKey { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -11,7 +11,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// Represents a ISelectableItemsMessenger
     /// </summary>
     public class ISelectableItemsMessenger<TKey> : MessengerBase
-    {
+    {        
         private readonly ISelectableItems<TKey> itemDevice;
 
         private readonly string _propName;
@@ -34,10 +34,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
             base.RegisterActions();
 
             AddAction("/fullStatus", (id, context) =>
-                SendFullStatus(id)
-            );
-
-            AddAction("/itemsStatus", (id, content) => SendFullStatus(id));
+            {
+                SendFullStatus();
+            });
 
             itemDevice.ItemsUpdated += (sender, args) =>
             {
@@ -66,7 +65,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             }
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             try
             {
@@ -78,7 +77,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                     CurrentItem = itemDevice.CurrentItem
                 };
 
-                PostStatusMessage(stateObject, id);
+                PostStatusMessage(stateObject);
             }
             catch (Exception e)
             {
@@ -92,17 +91,13 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class ISelectableItemsStateMessage<TKey> : DeviceStateMessageBase
     {
-        /// <summary>
-        /// Gets or sets the Items
-        /// </summary>
         [JsonProperty("items")]
         public Dictionary<TKey, ISelectableItem> Items { get; set; }
 
-
+        [JsonProperty("currentItem")]
         /// <summary>
         /// Gets or sets the CurrentItem
         /// </summary>
-        [JsonProperty("currentItem")]
         public TKey CurrentItem { get; set; }
     }
 

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IShutdownPromptTimerMessenger.cs

@@ -20,9 +20,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         protected override void RegisterActions()
         {
-            AddAction("/status", (id, content) => SendFullStatus(id));
-
-            AddAction("/shutdownPromptStatus", (id, content) => SendFullStatus(id));
+            AddAction("/status", (id, content) =>
+            {
+                SendFullStatus();
+            });
 
             AddAction("/setShutdownPromptSeconds", (id, content) =>
             {
@@ -67,7 +68,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             };
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             var status = new IShutdownPromptTimerStateMessage
             {
@@ -76,7 +77,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 PercentageRemaining = _room.ShutdownPromptTimer.PercentFeedback.UShortValue
             };
 
-            PostStatusMessage(status, id);
+            PostStatusMessage(status);
         }
     }
 
@@ -86,22 +87,22 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class IShutdownPromptTimerStateMessage : DeviceStateMessageBase
     {
+        [JsonProperty("secondsRemaining")]
         /// <summary>
         /// Gets or sets the SecondsRemaining
         /// </summary>
-        [JsonProperty("secondsRemaining")]
         public int SecondsRemaining { get; set; }
 
+        [JsonProperty("percentageRemaining")]
         /// <summary>
         /// Gets or sets the PercentageRemaining
         /// </summary>
-        [JsonProperty("percentageRemaining")]
         public int PercentageRemaining { get; set; }
 
+        [JsonProperty("shutdownPromptSeconds")]
         /// <summary>
         /// Gets or sets the ShutdownPromptSeconds
         /// </summary>
-        [JsonProperty("shutdownPromptSeconds")]
         public int ShutdownPromptSeconds { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs

@@ -1,7 +1,7 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.CrestronIO;
+using System;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -23,9 +23,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/switchedOutputStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
 
             AddAction("/on", (id, content) =>
             {
@@ -44,14 +42,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
             device.OutputIsOnFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>((o, a) => SendFullStatus());
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             var state = new ISwitchedOutputStateMessage
             {
                 IsOn = device.OutputIsOnFeedback.BoolValue
             };
 
-            PostStatusMessage(state, id);
+            PostStatusMessage(state);
         }
     }
 
@@ -60,10 +58,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class ISwitchedOutputStateMessage : DeviceStateMessageBase
     {
+        [JsonProperty("isOn")]
         /// <summary>
         /// Gets or sets the IsOn
         /// </summary>
-        [JsonProperty("isOn")]
         public bool IsOn { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs

@@ -20,9 +20,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
         protected override void RegisterActions()
         {
 
-            AddAction("/status", (id, content) => SendFullStatus(id));
-
-            AddAction("/techPasswordStatus", (id, content) => SendFullStatus(id));
+            AddAction("/status", (id, content) =>
+            {
+                SendFullStatus();
+            });
 
             AddAction("/validateTechPassword", (id, content) =>
             {
@@ -54,14 +55,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
             };
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             var status = new ITechPasswordStateMessage
             {
                 TechPasswordLength = _room.TechPasswordLength
             };
 
-            PostStatusMessage(status, id);
+            PostStatusMessage(status);
         }
 
     }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITemperatureSensorMessenger.cs

@@ -1,7 +1,7 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -22,9 +22,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/temperatureStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
 
             AddAction("/setTemperatureUnitsToCelcius", (id, content) =>
             {
@@ -40,7 +38,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             device.TemperatureInCFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>((o, a) => SendFullStatus());
         }
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             // format the temperature to a string with one decimal place
             var tempString = string.Format("{0}.{1}", device.TemperatureFeedback.UShortValue / 10, device.TemperatureFeedback.UShortValue % 10);
@@ -51,7 +49,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 TemperatureInCelsius = device.TemperatureInCFeedback.BoolValue
             };
 
-            PostStatusMessage(state, id);
+            PostStatusMessage(state);
         }
     }
 
@@ -60,16 +58,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class ITemperatureSensorStateMessage : DeviceStateMessageBase
     {
+        [JsonProperty("temperature")]
         /// <summary>
         /// Gets or sets the Temperature
         /// </summary>
-        [JsonProperty("temperature")]
         public string Temperature { get; set; }
 
+        [JsonProperty("temperatureInCelsius")]
         /// <summary>
         /// Gets or sets the TemperatureInCelsius
         /// </summary>
-        [JsonProperty("temperatureInCelsius")]
         public bool TemperatureInCelsius { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Lighting;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -35,9 +35,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             base.RegisterActions();
 
-            AddAction("/fullStatus", (id, content) => SendFullStatus(id));
-
-            AddAction("/lightingStatus", (id, content) => SendFullStatus(id));
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
 
             AddAction("/selectScene", (id, content) =>
             {
@@ -45,14 +43,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 lightingScenesDevice.SelectScene(s);
             });
 
-            if (!(lightingScenesDevice is ILightingScenesDynamic lightingScenesDynamic))
+            if(!(lightingScenesDevice is ILightingScenesDynamic lightingScenesDynamic))
                 return;
 
             lightingScenesDynamic.LightingScenesUpdated += (s, e) => SendFullStatus();
         }
 
 
-        private void SendFullStatus(string id = null)
+        private void SendFullStatus()
         {
             var state = new LightingBaseStateMessage
             {
@@ -60,7 +58,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 CurrentLightingScene = lightingScenesDevice.CurrentLightingScene
             };
 
-            PostStatusMessage(state, id);
+            PostStatusMessage(state);
         }
     }
 
@@ -69,17 +67,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// </summary>
     public class LightingBaseStateMessage : DeviceStateMessageBase
     {
+        [JsonProperty("scenes", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Scenes
         /// </summary>
-        [JsonProperty("scenes", NullValueHandling = NullValueHandling.Ignore)]
         public List<LightingScene> Scenes { get; set; }
 
-
+        [JsonProperty("currentLightingScene", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the CurrentLightingScene
         /// </summary>
-        [JsonProperty("currentLightingScene", NullValueHandling = NullValueHandling.Ignore)]
         public LightingScene CurrentLightingScene { get; set; }
     }
 }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs

@@ -1,45 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Crestron.SimplSharp.Net;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
     /// <summary>
     /// Provides a messaging bridge
     /// </summary>
-    public abstract class MessengerBase : EssentialsDevice, IMobileControlMessengerWithSubscriptions
+    public abstract class MessengerBase : EssentialsDevice, IMobileControlMessenger
     {
-        /// <summary>
-        /// The device this messenger is associated with
-        /// </summary>
         protected IKeyName _device;
 
-        /// <summary>
-        /// Enable subscriptions
-        /// </summary>
-        protected bool enableMessengerSubscriptions;
-
-        /// <summary>
-        /// List of clients subscribed to this messenger
-        /// </summary>
-        /// <remarks>
-        /// Unsoliciited feedback from a device in a messenger will ONLY be sent to devices in this subscription list. When a client disconnects, it's ID will be removed from the collection.
-        /// </remarks>
-        protected HashSet<string> SubscriberIds = new HashSet<string>();
-
         private readonly List<string> _deviceInterfaces;
 
         private readonly Dictionary<string, Action<string, JToken>> _actions = new Dictionary<string, Action<string, JToken>>();
 
-        /// <summary>
-        /// Gets the DeviceKey
-        /// </summary>
         public string DeviceKey => _device?.Key ?? "";
 
 
@@ -69,12 +50,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
             MessagePath = messagePath;
         }
 
-        /// <summary>
-        /// Constructor for a messenger associated with a device
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="messagePath"></param>
-        /// <param name="device"></param>
         protected MessengerBase(string key, string messagePath, IKeyName device)
             : this(key, messagePath)
         {
@@ -106,21 +81,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
             RegisterActions();
         }
 
-        /// <summary>
-        /// Register this messenger with appserver controller
-        /// </summary>
-        /// <param name="appServerController">Parent controller for this messenger</param>
-        /// <param name="enableMessengerSubscriptions">Enable subscriptions</param>
-        public void RegisterWithAppServer(IMobileControl appServerController, bool enableMessengerSubscriptions)
-        {
-            this.enableMessengerSubscriptions = enableMessengerSubscriptions;
-            AppServerController = appServerController ?? throw new ArgumentNullException("appServerController");
-
-            AppServerController.AddAction(this, HandleMessage);
-
-            RegisterActions();
-        }
-
         private void HandleMessage(string path, string id, JToken content)
         {
             // replace base path with empty string. Should leave something like /fullStatus
@@ -131,20 +91,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 return;
             }
 
-            this.LogDebug("Executing action for path {path}", path);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Executing action for path {path}", this, path);
 
             action(id, content);
         }
 
-        /// <summary>
-        /// Adds an action for a given path
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="action"></param>
         protected void AddAction(string path, Action<string, JToken> action)
         {
             if (_actions.ContainsKey(path))
             {
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, $"Messenger {Key} already has action registered at {path}", this);
                 return;
             }
 
@@ -159,10 +115,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
             return _actions.Keys.ToList();
         }
 
-        /// <summary>
-        /// Removes an action for a given path
-        /// </summary>
-        /// <param name="path"></param>
         protected void RemoveAction(string path)
         {
             if (!_actions.ContainsKey(path))
@@ -176,62 +128,17 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <summary>
         /// Implemented in extending classes. Wire up API calls and feedback here
         /// </summary>
+        /// <param name="appServerController"></param>
         protected virtual void RegisterActions()
         {
 
         }
 
-        /// <summary>
-        /// Add client to the susbscription list for unsolicited feedback
-        /// </summary>
-        /// <param name="clientId">Client ID to add</param>
-        protected void SubscribeClient(string clientId)
-        {
-            if (!enableMessengerSubscriptions)
-            {
-                this.LogWarning("Messenger subscriptions not enabled");
-                return;
-            }
-
-            if (SubscriberIds.Any(id => id == clientId))
-            {
-                this.LogVerbose("Client {clientId} already subscribed", clientId);
-                return;
-            }
-
-            SubscriberIds.Add(clientId);
-
-            this.LogDebug("Client {clientId} subscribed", clientId);
-        }
-
-        /// <summary>
-        /// Remove a client from the subscription list
-        /// </summary>
-        /// <param name="clientId">Client ID to remove</param>
-        public void UnsubscribeClient(string clientId)
-        {
-            if (!enableMessengerSubscriptions)
-            {
-                this.LogWarning("Messenger subscriptions not enabled");
-                return;
-            }
-
-            if (!SubscriberIds.Any(i => i == clientId))
-            {
-                this.LogVerbose("Client with ID {clientId} is not subscribed", clientId);
-                return;
-            }
-
-            SubscriberIds.RemoveWhere((i) => i == clientId);
-
-            this.LogInformation("Client with ID {clientId} unsubscribed", clientId);
-        }
-
         /// <summary>
         /// Helper for posting status message
         /// </summary>
+        /// <param name="type"></param>
         /// <param name="message"></param>
-        /// <param name="clientId">Optional client id that will direct the message back to only that client</param>
         protected void PostStatusMessage(DeviceStateMessageBase message, string clientId = null)
         {
             try
@@ -252,22 +159,16 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
                 message.Name = _device.Name;
 
-                var token = JToken.FromObject(message);
-
+                var token = JToken.FromObject(message);                
+                
                 PostStatusMessage(token, MessagePath, clientId);
             }
             catch (Exception ex)
             {
-                this.LogError(ex, "Exception posting status message for {messagePath} to {clientId}", MessagePath, clientId ?? "all clients");
+                this.LogError(ex, "Exception posting status message for {messagePath} to {clientId}", MessagePath, clientId ?? "all clients");                
             }
         }
 
-        /// <summary>
-        /// Helper for posting status message
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="deviceState"></param>
-        /// <param name="clientId">Optional client id that will direct the message back to only that client</param>
         protected void PostStatusMessage(string type, DeviceStateMessageBase deviceState, string clientId = null)
         {
             try
@@ -287,54 +188,22 @@ namespace PepperDash.Essentials.AppServer.Messengers
             }
             catch (Exception ex)
             {
-                this.LogError(ex, "Exception posting status message for {type} to {clientId}", type, clientId ?? "all clients");
+                this.LogError(ex, "Exception posting status message for {type} to {clientId}", type, clientId ?? "all clients");                
             }
         }
 
-        /// <summary>
-        /// Helper for posting status message
-        /// </summary>
-        /// <param name="content"></param>
-        /// <param name="type"></param>
-        /// <param name="clientId">Optional client id that will direct the message back to only that client</param>
         protected void PostStatusMessage(JToken content, string type = "", string clientId = null)
         {
             try
             {
-                // Allow for legacy method to continue without subscriptions
-                if (!enableMessengerSubscriptions)
-                {
-                    AppServerController?.SendMessageObject(new MobileControlMessage { Type = !string.IsNullOrEmpty(type) ? type : MessagePath, ClientId = clientId, Content = content });
-                    return;
-                }
-
-                // handle subscription feedback
-                // If client is null or empty, this message is unsolicited feedback. Iterate through the subscriber list and send to all interested parties
-                if (string.IsNullOrEmpty(clientId))
-                {
-                    foreach (var client in SubscriberIds)
-                    {
-                        AppServerController?.SendMessageObject(new MobileControlMessage { Type = !string.IsNullOrEmpty(type) ? type : MessagePath, ClientId = client, Content = content });
-                    }
-
-                    return;
-                }
-
-                SubscribeClient(clientId);
-
                 AppServerController?.SendMessageObject(new MobileControlMessage { Type = !string.IsNullOrEmpty(type) ? type : MessagePath, ClientId = clientId, Content = content });
             }
             catch (Exception ex)
             {
-                this.LogError("Exception posting status message: {message}", ex.Message);
-                this.LogDebug(ex, "Stack Trace: ");
+                Debug.LogMessage(ex, "Exception posting status message", this);
             }
         }
 
-        /// <summary>
-        /// Helper for posting event message
-        /// </summary>
-        /// <param name="message"></param>
         protected void PostEventMessage(DeviceEventMessageBase message)
         {
             message.Key = _device.Key;
@@ -348,11 +217,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
             });
         }
 
-        /// <summary>
-        /// Helper for posting event message
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="eventType"></param>
         protected void PostEventMessage(DeviceEventMessageBase message, string eventType)
         {
             message.Key = _device.Key;
@@ -368,10 +232,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
             });
         }
 
-        /// <summary>
-        /// Helper for posting event message with no content
-        /// </summary>
-        /// <param name="eventType"></param>
         protected void PostEventMessage(string eventType)
         {
             AppServerController?.SendMessageObject(new MobileControlMessage
@@ -382,4 +242,64 @@ namespace PepperDash.Essentials.AppServer.Messengers
         }
 
     }
-}
+
+    public abstract class DeviceMessageBase
+    {
+        /// <summary>
+        /// The device key
+        /// </summary>
+        [JsonProperty("key")]
+        /// <summary>
+        /// Gets or sets the Key
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// The device name
+        /// </summary>
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The type of the message class
+        /// </summary>
+        [JsonProperty("messageType")]
+        public string MessageType => GetType().Name;
+
+        [JsonProperty("messageBasePath")]
+        /// <summary>
+        /// Gets or sets the MessageBasePath
+        /// </summary>
+        public string MessageBasePath { get; set; }
+    }
+
+    /// <summary>
+    /// Represents a DeviceStateMessageBase
+    /// </summary>
+    public class DeviceStateMessageBase : DeviceMessageBase
+    {
+        /// <summary>
+        /// The interfaces implmented by the device sending the messsage
+        /// </summary>
+        [JsonProperty("interfaces")]
+        public List<string> Interfaces { get; private set; }
+
+        public void SetInterfaces(List<string> interfaces)
+        {
+            Interfaces = interfaces;
+        }
+    }
+
+    /// <summary>
+    /// Base class for event messages that include the type of message and an event type
+    /// </summary>
+    public abstract class DeviceEventMessageBase : DeviceMessageBase
+    {
+        /// <summary>
+        /// The event type
+        /// </summary>
+        [JsonProperty("eventType")]
+        public string EventType { get; set; }
+    }
+
+}

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/PressAndHoldHandler.cs

@@ -1,14 +1,11 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
-    /// <summary>
-    /// Handler for press/hold/release messages
-    /// </summary>
     public static class PressAndHoldHandler
     {
         private const long ButtonHeartbeatInterval = 1000;
@@ -29,21 +26,21 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         private static void AddTimer(string deviceKey, Action<bool> action)
         {
-            Debug.LogDebug("Attempting to add timer for {deviceKey}", deviceKey);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to add timer for {deviceKey}", deviceKey);
 
             if (_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer))
             {
-                Debug.LogDebug("Timer for {deviceKey} already exists", deviceKey);
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} already exists", deviceKey);
                 return;
             }
 
-            Debug.LogDebug("Adding timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Adding timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
 
             action(true);
 
             cancelTimer = new CTimer(o =>
             {
-                Debug.LogDebug("Timer expired for {deviceKey}", deviceKey);
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer expired for {deviceKey}", deviceKey);
 
                 action(false);
 
@@ -55,30 +52,30 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         private static void ResetTimer(string deviceKey, Action<bool> action)
         {
-            Debug.LogDebug("Attempting to reset timer for {deviceKey}", deviceKey);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to reset timer for {deviceKey}", deviceKey);
 
             if (!_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer))
             {
-                Debug.LogDebug("Timer for {deviceKey} not found", deviceKey);
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} not found", deviceKey);
                 return;
             }
 
-            Debug.LogDebug("Resetting timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Resetting timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
 
             cancelTimer.Reset(ButtonHeartbeatInterval);
         }
 
         private static void StopTimer(string deviceKey, Action<bool> action)
         {
-            Debug.LogDebug("Attempting to stop timer for {deviceKey}", deviceKey);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to stop timer for {deviceKey}", deviceKey);
 
             if (!_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer))
             {
-                Debug.LogDebug("Timer for {deviceKey} not found", deviceKey);
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} not found", deviceKey);
                 return;
             }
 
-            Debug.LogDebug("Stopping timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Stopping timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
 
             action(false);
             cancelTimer.Stop();
@@ -87,15 +84,15 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         public static Action<string, Action<bool>> GetPressAndHoldHandler(string value)
         {
-            Debug.LogDebug("Getting press and hold handler for {value}", value);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Getting press and hold handler for {value}", value);
 
             if (!_pushedActionHandlers.TryGetValue(value, out Action<string, Action<bool>> handler))
             {
-                Debug.LogDebug("Press and hold handler for {value} not found", value);
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Press and hold handler for {value} not found", value);
                 return null;
             }
 
-            Debug.LogDebug("Got handler for {value}", value);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Got handler for {value}", value);
 
             return handler;
         }
@@ -107,7 +104,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         {
             var msg = content.ToObject<MobileControlSimpleContent<string>>();
 
-            Debug.LogDebug("Handling press and hold message of {type} for {deviceKey}", msg.Value, deviceKey);
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Handling press and hold message of {type} for {deviceKey}", msg.Value, deviceKey);
 
             var timerHandler = GetPressAndHoldHandler(msg.Value);
 

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Room.Config;
+using System;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -31,14 +31,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             {
                 var events = _room.GetScheduledEvents();
 
-                SendFullStatus(events, id);
-            });
-
-            AddAction("/scheduledEventsStatus", (id, content) =>
-            {
-                var events = _room.GetScheduledEvents();
-
-                SendFullStatus(events, id);
+                SendFullStatus(events);
             });
 
             _room.ScheduledEventsChanged += (sender, args) => SendFullStatus(args.ScheduledEvents);
@@ -62,11 +55,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
             }
             catch (Exception ex)
             {
-                this.LogException(ex, "Exception saving event");
+                this.LogException(ex,"Exception saving event");
             }
         }
 
-        private void SendFullStatus(List<ScheduledEventConfig> events, string id = null)
+        private void SendFullStatus(List<ScheduledEventConfig> events)
         {
 
             var message = new RoomEventScheduleStateMessage
@@ -74,7 +67,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 ScheduleEvents = events,
             };
 
-            PostStatusMessage(message, id);
+            PostStatusMessage(message);
         }
     }