refactor(force-patch): move MC touch panel class to use partial classes

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.18.2-local</Version>
+    <Version>2.15.1-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/GenericUdpServer.cs

@@ -131,14 +131,14 @@ namespace PepperDash.Core
         /// <param name="key"></param>
         /// <param name="address"></param>
         /// <param name="port"></param>
-        /// <param name="bufferSize"></param>
-        public GenericUdpServer(string key, string address, int port, int bufferSize)
+        /// <param name="buffefSize"></param>
+        public GenericUdpServer(string key, string address, int port, int buffefSize)
             : base(key)
         {
             StreamDebugging = new CommunicationStreamDebugging(key); 
             Hostname = address;
             Port = port;
-            BufferSize = bufferSize;
+            BufferSize = buffefSize;
 
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
@@ -194,21 +194,7 @@ namespace PepperDash.Core
         {
             if (Server == null)
             {
-                try
-                {
-                    var address = IPAddress.Parse(Hostname);
-
-                    Server = new UDPServer(address, Port, BufferSize);
-
-                }
-                catch (Exception ex)
-                {
-                    this.LogError("Error parsing IP Address '{ipAddress}': message: {message}", Hostname, ex.Message);
-                    this.LogInformation("Creating UDPServer with default buffersize");
-
-                    Server = new UDPServer();
-                }
-
+                Server = new UDPServer();
             }
 
             if (string.IsNullOrEmpty(Hostname))

src/PepperDash.Core/Config/PortalConfigReader.cs

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

src/PepperDash.Core/Logging/Debug.cs

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

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

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

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

@@ -16,21 +16,13 @@ namespace PepperDash.Essentials.Core.Config
 	/// </summary>
 	public class EssentialsConfig : BasicConfig
 	{
-        /// <summary>
-        /// Gets or sets the SystemUrl
-        /// </summary>
-        [JsonProperty("system_url")]
+		[JsonProperty("system_url")]
         public string SystemUrl { get; set; }
 
-        /// <summary>
-        /// Gets or sets the TemplateUrl
-        /// </summary>
-        [JsonProperty("template_url")]
+		[JsonProperty("template_url")]
         public string TemplateUrl { get; set; }
 
-        /// <summary>
-        /// Gets the SystemUuid extracted from the SystemUrl
-        /// </summary>
+
 		[JsonProperty("systemUuid")]
 		public string SystemUuid
         {
@@ -53,9 +45,6 @@ namespace PepperDash.Essentials.Core.Config
             }
         }
 
-        /// <summary>
-        /// Gets the TemplateUuid extracted from the TemplateUrl
-        /// </summary>
 		[JsonProperty("templateUuid")]
 		public string TemplateUuid
         {
@@ -78,84 +67,30 @@ namespace PepperDash.Essentials.Core.Config
             }
         }
 
+		[JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
-        [JsonProperty("rooms")]
         public List<DeviceConfig> Rooms { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Versions
-        /// </summary>
-        public VersionData Versions { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsConfig"/> class.
-        /// </summary>
         public EssentialsConfig()
             : base()
         {
             Rooms = new List<DeviceConfig>();
         }
 	}
-
-    /// <summary>
-    /// Represents version data for Essentials and its packages
-    /// </summary>
-    public class VersionData
-    {
-        /// <summary>
-        /// Gets or sets the Essentials version
-        /// </summary>
-        [JsonProperty("essentials")]
-        public NugetVersion Essentials { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of Packages
-        /// </summary>
-        [JsonProperty("packages")]
-        public List<NugetVersion> Packages { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VersionData"/> class.
-        /// </summary>
-        public VersionData()
-        {
-            Packages = new List<NugetVersion>();
-        }
-    }
-
-    /// <summary>
-    /// Represents a NugetVersion
-    /// </summary>
-    public class NugetVersion
-    {
-        /// <summary>
-        /// Gets or sets the Version
-        /// </summary>
-        [JsonProperty("version")]
-        public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets the PackageId
-        /// </summary>
-        [JsonProperty("packageId")]
-        public string PackageId { get; set; }
-    }
-
-    /// <summary>
-    /// Represents a SystemTemplateConfigs
-    /// </summary>
-    public class SystemTemplateConfigs
+		
+ /// <summary>
+ /// Represents a SystemTemplateConfigs
+ /// </summary>
+	public class SystemTemplateConfigs
 	{
-        /// <summary>
-        /// Gets or sets the System
-        /// </summary>
+  /// <summary>
+  /// Gets or sets the System
+  /// </summary>
 		public EssentialsConfig System { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Template
-        /// </summary>
 		public EssentialsConfig Template { get; set; }
 	}
 }

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

@@ -2,54 +2,59 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
-
+    [Description("Wrapper class for Digital Input")]
     /// <summary>
     /// Represents a GenericDigitalInputDevice
     /// </summary>
-    /// [Description("Wrapper class for Digital Input")]
-    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, 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/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

@@ -12,7 +12,7 @@ namespace PepperDash.Essentials.Core
 	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; }

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.Devices.Common/Audio/GenericAudioOut.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/PepperDash.Essentials.Devices.Common/Codec/Cisco/IPresenterTrack.cs

@@ -1,5 +1,10 @@
 using PepperDash.Core;
 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.Codec.Cisco
 {

src/PepperDash.Essentials.Devices.Common/Codec/Cisco/ISpeakerTrack.cs

@@ -1,5 +1,10 @@
 using PepperDash.Core;
 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.Codec.Cisco
 {

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

@@ -1,6 +1,10 @@
 
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -13,55 +17,55 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public class CodecActiveCallItem
     {
+		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Name
         /// </summary>
-		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
         public string Name { get; set; }
 
+        [JsonProperty("number", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Number
         /// </summary>
-        [JsonProperty("number", NullValueHandling = NullValueHandling.Ignore)]
         public string Number { get; set; }
 
+        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonConverter(typeof(StringEnumConverter))]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
-        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
-        [JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallType Type { get; set; }
 
+        [JsonProperty("status", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonConverter(typeof(StringEnumConverter))]
         /// <summary>
         /// Gets or sets the Status
         /// </summary>
-        [JsonProperty("status", NullValueHandling = NullValueHandling.Ignore)]
-        [JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallStatus Status { get; set; }
 
+        [JsonProperty("direction", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonConverter(typeof(StringEnumConverter))]
         /// <summary>
         /// Gets or sets the Direction
         /// </summary>
-        [JsonProperty("direction", NullValueHandling = NullValueHandling.Ignore)]
-        [JsonConverter(typeof(StringEnumConverter))]
         public eCodecCallDirection Direction { get; set; }
 
+        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Id
         /// </summary>
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
         public string Id { get; set; }
 
+        [JsonProperty("isOnHold", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the IsOnHold
         /// </summary>
-        [JsonProperty("isOnHold", NullValueHandling = NullValueHandling.Ignore)]
         public bool IsOnHold { get; set; }
 
+        [JsonProperty("duration", NullValueHandling = NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the Duration
         /// </summary>
-        [JsonProperty("duration", NullValueHandling = NullValueHandling.Ignore)]
         public TimeSpan Duration { get; set; }
 
         //public object CallMetaData { get; set; }
@@ -77,7 +81,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             {
                 return !(Status == eCodecCallStatus.Disconnected
                     || Status == eCodecCallStatus.Disconnecting
-                    || Status == eCodecCallStatus.Idle
+					|| Status == eCodecCallStatus.Idle
                     || Status == eCodecCallStatus.Unknown);
             }
         }
@@ -93,10 +97,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         /// </summary>
         public CodecActiveCallItem CallItem { get; private set; }
 
-        /// <summary>
-        /// Initializes a new instance of the CodecCallStatusItemChangeEventArgs class
-        /// </summary>
-        /// <param name="item">The call item that changed</param>
         public CodecCallStatusItemChangeEventArgs(CodecActiveCallItem item)
         {
             CallItem = item;

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

@@ -1,121 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a codec directory
-  /// </summary>
-  public class CodecDirectory
-  {
-    /// <summary>
-    /// Represents the contents of the directory
-    /// We don't want to serialize this for messages to MobileControl.  MC can combine Contacts and Folders to get the same data
-    /// </summary>
-    [JsonIgnore]
-    public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
-
-    /// <summary>
-    /// Gets the Contacts in the CurrentDirectoryResults
-    /// </summary>
-    [JsonProperty("contacts")]
-    public List<DirectoryItem> Contacts
-    {
-      get
-      {
-        return CurrentDirectoryResults.OfType<DirectoryContact>().Cast<DirectoryItem>().ToList();
-      }
-    }
-
-    /// <summary>
-    /// Gets the Folders in the CurrentDirectoryResults
-    /// </summary>
-    [JsonProperty("folders")]
-    public List<DirectoryItem> Folders
-    {
-      get
-      {
-        return CurrentDirectoryResults.OfType<DirectoryFolder>().Cast<DirectoryItem>().ToList();
-      }
-    }
-
-    /// <summary>
-    /// Used to store the ID of the current folder for CurrentDirectoryResults
-    /// Gets or sets the ResultsFolderId
-    /// </summary>
-    [JsonProperty("resultsFolderId")]
-    public string ResultsFolderId { get; set; }
-
-    /// <summary>
-    /// Constructor for <see cref="CodecDirectory"/>
-    /// </summary>
-    public CodecDirectory()
-    {
-      CurrentDirectoryResults = new List<DirectoryItem>();
-    }
-
-    /// <summary>
-    /// Adds folders to the directory
-    /// </summary>
-    /// <param name="folders"></param>        
-    public void AddFoldersToDirectory(List<DirectoryItem> folders)
-    {
-      if (folders != null)
-        CurrentDirectoryResults.AddRange(folders);
-
-      SortDirectory();
-    }
-
-    /// <summary>
-    /// Adds contacts to the directory
-    /// </summary>
-    /// <param name="contacts"></param>        
-    public void AddContactsToDirectory(List<DirectoryItem> contacts)
-    {
-      if (contacts != null)
-        CurrentDirectoryResults.AddRange(contacts);
-
-      SortDirectory();
-    }
-
-    /// <summary>
-    /// Filters the CurrentDirectoryResults by the predicate
-    /// </summary>
-    /// <param name="predicate"></param>
-
-    public void FilterContacts(Func<DirectoryItem, bool> predicate)
-    {
-      CurrentDirectoryResults = CurrentDirectoryResults.Where(predicate).ToList();
-    }
-
-    /// <summary>
-    /// Sorts the DirectoryResults list to display all folders alphabetically, then all contacts alphabetically
-    /// </summary>
-    private void SortDirectory()
-    {
-      var sortedFolders = new List<DirectoryItem>();
-
-      sortedFolders.AddRange(CurrentDirectoryResults.Where(f => f is DirectoryFolder));
-
-      sortedFolders.OrderBy(f => f.Name);
-
-      var sortedContacts = new List<DirectoryItem>();
-
-      sortedContacts.AddRange(CurrentDirectoryResults.Where(c => c is DirectoryContact));
-
-      sortedFolders.OrderBy(c => c.Name);
-
-      CurrentDirectoryResults.Clear();
-
-      CurrentDirectoryResults.AddRange(sortedFolders);
-
-      CurrentDirectoryResults.AddRange(sortedContacts);
-    }
-
-  }
-}

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

@@ -1,146 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a CodecScheduleAwareness
-  /// </summary>
-  public class CodecScheduleAwareness
-  {
-    List<Meeting> _meetings;
-
-    /// <summary>
-    /// Event that is raised when a meeting event changes
-    /// </summary>
-    public event EventHandler<MeetingEventArgs> MeetingEventChange;
-
-    /// <summary>
-    /// Event that is raised when the meetings list has changed
-    /// </summary>
-    public event EventHandler<EventArgs> MeetingsListHasChanged;
-
-    private int _meetingWarningMinutes = 5;
-
-    //private Meeting _previousChangedMeeting;
-
-    //private eMeetingEventChangeType _previousChangeType = eMeetingEventChangeType.Unknown;
-
-    /// <summary>
-    /// Gets or sets the number of minutes before a meeting to issue a warning
-    /// </summary>
-    public int MeetingWarningMinutes
-    {
-      get { return _meetingWarningMinutes; }
-      set { _meetingWarningMinutes = value; }
-    }
-
-    /// <summary>
-    /// Setter triggers MeetingsListHasChanged event
-    /// </summary>
-    public List<Meeting> Meetings
-    {
-      get
-      {
-        return _meetings;
-      }
-      set
-      {
-        _meetings = value;
-        MeetingsListHasChanged?.Invoke(this, new EventArgs());
-      }
-    }
-
-    private readonly CTimer _scheduleChecker;
-
-    /// <summary>
-    /// Initializes a new instance of the CodecScheduleAwareness class with default poll time
-    /// </summary>
-    public CodecScheduleAwareness()
-    {
-      Meetings = new List<Meeting>();
-
-      _scheduleChecker = new CTimer(CheckSchedule, null, 1000, 1000);
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the CodecScheduleAwareness class with specified poll time
-    /// </summary>
-    /// <param name="pollTime">The poll time in milliseconds for checking schedule changes</param>
-    public CodecScheduleAwareness(long pollTime)
-    {
-      Meetings = new List<Meeting>();
-
-      _scheduleChecker = new CTimer(CheckSchedule, null, pollTime, pollTime);
-    }
-
-    /// <summary>
-    /// Helper method to fire MeetingEventChange.  Should only fire once for each changeType on each meeting
-    /// </summary>
-    /// <param name="changeType"></param>
-    /// <param name="meeting"></param>
-    private void OnMeetingChange(eMeetingEventChangeType changeType, Meeting meeting)
-    {
-      Debug.LogMessage(LogEventLevel.Verbose, "*****************OnMeetingChange.  id: {0} changeType: {1}**********************", meeting.Id, changeType);
-      if (changeType != (changeType & meeting.NotifiedChangeTypes))
-      {
-        // Add this change type to the NotifiedChangeTypes
-        meeting.NotifiedChangeTypes |= changeType;
-        MeetingEventChange?.Invoke(this, new MeetingEventArgs() { ChangeType = changeType, Meeting = meeting });
-      }
-      else
-      {
-        Debug.LogMessage(LogEventLevel.Verbose, "Meeting: {0} already notified of changeType: {1}", meeting.Id, changeType);
-      }
-    }
-
-
-    /// <summary>
-    /// Checks the schedule to see if any MeetingEventChange updates should be fired
-    /// </summary>
-    /// <param name="o"></param>
-    private void CheckSchedule(object o)
-    {
-      //  Iterate the meeting list and check if any meeting need to do anything
-
-      const double meetingTimeEpsilon = 0.05;
-      foreach (var m in Meetings)
-      {
-        var changeType = eMeetingEventChangeType.Unknown;
-
-        if (eMeetingEventChangeType.MeetingStartWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStartWarning) && m.TimeToMeetingStart.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingStart.Seconds > 0)       // Meeting is about to start
-        {
-          Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingStartWarning. TotalMinutes: {0}  Seconds: {1}", m.TimeToMeetingStart.TotalMinutes, m.TimeToMeetingStart.Seconds);
-          changeType = eMeetingEventChangeType.MeetingStartWarning;
-        }
-        else if (eMeetingEventChangeType.MeetingStart != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStart) && Math.Abs(m.TimeToMeetingStart.TotalMinutes) < meetingTimeEpsilon)           // Meeting Start
-        {
-          Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingStart");
-          changeType = eMeetingEventChangeType.MeetingStart;
-        }
-        else if (eMeetingEventChangeType.MeetingEndWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEndWarning) && m.TimeToMeetingEnd.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingEnd.Seconds > 0)    // Meeting is about to end
-        {
-          Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingEndWarning. TotalMinutes: {0}  Seconds: {1}", m.TimeToMeetingEnd.TotalMinutes, m.TimeToMeetingEnd.Seconds);
-          changeType = eMeetingEventChangeType.MeetingEndWarning;
-        }
-        else if (eMeetingEventChangeType.MeetingEnd != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEnd) && Math.Abs(m.TimeToMeetingEnd.TotalMinutes) < meetingTimeEpsilon)             // Meeting has ended
-        {
-          Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingEnd");
-          changeType = eMeetingEventChangeType.MeetingEnd;
-        }
-
-        if (changeType != eMeetingEventChangeType.Unknown)
-        {
-          OnMeetingChange(changeType, m);
-        }
-      }
-
-    }
-  }
-
-}

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

@@ -1,37 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a ContactMethod
-  /// </summary>
-  public class ContactMethod
-  {
-    /// <summary>
-    /// Gets or sets the ContactMethodId
-    /// </summary>
-    [JsonProperty("contactMethodId")]
-    public string ContactMethodId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Number
-    /// </summary>
-    [JsonProperty("number")]
-    public string Number { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Device
-    /// </summary>
-    [JsonProperty("device")]
-    [JsonConverter(typeof(StringEnumConverter))]
-    public eContactMethodDevice Device { get; set; }
-
-    /// <summary>
-    /// Gets or sets the CallType
-    /// </summary>
-    [JsonProperty("callType")]
-    [JsonConverter(typeof(StringEnumConverter))]
-    public eContactMethodCallType CallType { get; set; }
-  }
-}

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

@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a DirectoryContact
-  /// </summary>
-  public class DirectoryContact : DirectoryItem
-  {
-
-    /// <summary>
-    /// Gets or sets the ContactId
-    /// </summary>
-    [JsonProperty("contactId")]
-    public string ContactId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Title
-    /// </summary>
-    [JsonProperty("title")]
-    public string Title { get; set; }
-
-    /// <summary>
-    /// Gets or sets the ContactMethods
-    /// </summary>
-    [JsonProperty("contactMethods")]
-    public List<ContactMethod> ContactMethods { get; set; }
-
-    /// <summary>
-    /// Constructor for <see cref="DirectoryContact"/>
-    /// </summary>
-    public DirectoryContact()
-    {
-      ContactMethods = new List<ContactMethod>();
-    }
-  }
-}

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

@@ -1,21 +0,0 @@
-
-
-using System;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a DirectoryEventArgs
-  /// </summary>
-  public class DirectoryEventArgs : EventArgs
-  {
-    /// <summary>
-    /// Gets or sets the Directory
-    /// </summary>
-    public CodecDirectory Directory { get; set; }
-    /// <summary>
-    /// Gets or sets the DirectoryIsOnRoot
-    /// </summary>
-    public bool DirectoryIsOnRoot { get; set; }
-  }
-}

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

@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a DirectoryFolder
-  /// </summary>
-  public class DirectoryFolder : DirectoryItem
-  {
-
-    /// <summary>
-    /// Gets or sets the Contacts
-    /// </summary>
-    [JsonProperty("contacts")]
-    public List<DirectoryContact> Contacts { get; set; }
-
-    /// <summary>
-    /// Constructor for <see cref="DirectoryFolder"/>
-    /// </summary>
-    public DirectoryFolder()
-    {
-      Contacts = new List<DirectoryContact>();
-    }
-  }
-}

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

@@ -1,41 +0,0 @@
-
-
-using System;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a DirectoryItem
-  /// </summary>
-  public class DirectoryItem : ICloneable
-  {
-    /// <summary>
-    /// Clone method
-    /// </summary>
-    public object Clone()
-    {
-      return MemberwiseClone();
-    }
-
-    /// <summary>
-    /// Gets or sets the FolderId
-    /// </summary>
-    [JsonProperty("folderId")]
-    public string FolderId { get; set; }
-
-
-    /// <summary>
-    /// Gets or sets the Name
-    /// </summary>
-    [JsonProperty("name")]
-    public string Name { get; set; }
-
-    /// <summary>
-    /// Gets or sets the ParentFolderId
-    /// </summary>
-    [JsonProperty("parentFolderId")]
-    public string ParentFolderId { get; set; }
-  }
-}

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

@@ -1,65 +1,31 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
+using Crestron.SimplSharpPro;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+{ 
     /// <summary>
     /// Describes a cisco codec device that can allow configuration of cameras
     /// </summary>
     public interface ICiscoCodecCameraConfig
     {
-        /// <summary>
-        /// Sets the assigned serial number for the specified camera
-        /// </summary>
-        /// <param name="cameraId">The camera identifier</param>
-        /// <param name="serialNumber">The serial number to assign</param>
         void SetCameraAssignedSerialNumber(uint cameraId, string serialNumber);
 
-        /// <summary>
-        /// Sets the name for the camera on the specified video connector
-        /// </summary>
-        /// <param name="videoConnectorId">The video connector identifier</param>
-        /// <param name="name">The name to assign</param>
         void SetCameraName(uint videoConnectorId, string name);
 
-        /// <summary>
-        /// Sets the input source type for the specified video connector
-        /// </summary>
-        /// <param name="videoConnectorId">The video connector identifier</param>
-        /// <param name="sourceType">The source type to set</param>
         void SetInputSourceType(uint videoConnectorId, eCiscoCodecInputSourceType sourceType);
     }
 
-    /// <summary>
-    /// Enumeration of Cisco codec input source types
-    /// </summary>
     public enum eCiscoCodecInputSourceType
     {
-        /// <summary>
-        /// PC source type
-        /// </summary>
         PC,
-
-        /// <summary>
-        /// Camera source type
-        /// </summary>
         camera,
-
-        /// <summary>
-        /// Document camera source type
-        /// </summary>
         document_camera,
-
-        /// <summary>
-        /// Media player source type
-        /// </summary>
         mediaplayer,
-
-        /// <summary>
-        /// Other source type
-        /// </summary>
         other,
-
-        /// <summary>
-        /// Whiteboard source type
-        /// </summary>
         whiteboard
     }
 }

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

@@ -1,4 +1,10 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
 {
     /// <summary>
     /// Defines the contract for IHasCallHold

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

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using PepperDash.Essentials.Devices.Common.Codec;
-
-
-/// <summary>
-/// Defines the contract for IHasDirectoryHistoryStack
-/// </summary>
-public interface IHasDirectoryHistoryStack : IHasDirectory
-{
-  /// <summary>
-  /// Gets the DirectoryBrowseHistoryStack
-  /// </summary>
-  Stack<CodecDirectory> DirectoryBrowseHistoryStack { get; }
-}

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

@@ -1,4 +1,10 @@
-using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
@@ -28,9 +34,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         void ToggleDoNotDisturbMode();
     }
 
-    /// <summary>
-    /// Defines the contract for devices that support Do Not Disturb mode with timeout functionality
-    /// </summary>
     public interface IHasDoNotDisturbModeWithTimeout : IHasDoNotDisturbMode
     {
         /// <summary>

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

@@ -1,54 +1,25 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
-	/// <summary>
-	/// Defines the contract for IHasExternalSourceSwitching
-	/// </summary>
+ /// <summary>
+ /// Defines the contract for IHasExternalSourceSwitching
+ /// </summary>
 	public interface IHasExternalSourceSwitching
 	{
-		/// <summary>
-		/// Gets a value indicating whether the external source list is enabled
-		/// </summary>
 		bool ExternalSourceListEnabled { get; }
-
-		/// <summary>
-		/// Gets the external source input port identifier
-		/// </summary>
-		string ExternalSourceInputPort { get; }
-
-		/// <summary>
-		/// Adds an external source to the available sources
-		/// </summary>
-		/// <param name="connectorId">The connector identifier</param>
-		/// <param name="key">The unique key for the source</param>
-		/// <param name="name">The display name for the source</param>
-		/// <param name="type">The type of external source</param>
+        string ExternalSourceInputPort { get; }
 		void AddExternalSource(string connectorId, string key, string name, eExternalSourceType type);
-
-		/// <summary>
-		/// Sets the state of the specified external source
-		/// </summary>
-		/// <param name="key">The unique key of the external source</param>
-		/// <param name="mode">The mode to set for the source</param>
 		void SetExternalSourceState(string key, eExternalSourceMode mode);
-
-		/// <summary>
-		/// Clears all external sources from the list
-		/// </summary>
 		void ClearExternalSources();
-
-		/// <summary>
-		/// Sets the selected source by its key
-		/// </summary>
-		/// <param name="key">The unique key of the source to select</param>
-		void SetSelectedSource(string key);
-
-		/// <summary>
-		/// Sets the action to run when routing between sources
-		/// </summary>
-		Action<string, string> RunRouteAction { set; }
+        void SetSelectedSource(string key);
+		Action<string, string> RunRouteAction { set;}
 	}
 
 }

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

@@ -1,13 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Defines the contract for IInvitableContact
-  /// </summary>
-  public interface IInvitableContact
-  {
-    /// <summary>
-    /// Gets a value indicating whether this contact is invitable
-    /// </summary>
-    bool IsInvitableContact { get; }
-  }
-}

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

@@ -1,22 +0,0 @@
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents an InvitableDirectoryContact
-  /// </summary>
-  public class InvitableDirectoryContact : DirectoryContact, IInvitableContact
-  {
-    /// <summary>
-    /// Gets a value indicating whether this contact is invitable
-    /// </summary>
-    [JsonProperty("isInvitableContact")]
-    public bool IsInvitableContact
-    {
-      get
-      {
-        return this is IInvitableContact;
-      }
-    }
-  }
-}

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

@@ -1,182 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a Meeting
-  /// </summary>
-  public class Meeting
-  {
-    /// <summary>
-    /// Minutes before the meeting to show warning
-    /// </summary>
-    [JsonProperty("minutesBeforeMeeting")]
-    public int MinutesBeforeMeeting;
-
-    /// <summary>
-    /// Gets or sets the meeting ID
-    /// </summary>
-    [JsonProperty("id")]
-    public string Id { get; set; }
-    /// <summary>
-    /// Gets or sets the meeting organizer
-    /// </summary>
-    [JsonProperty("organizer")]
-    public string Organizer { get; set; }
-    /// <summary>
-    /// Gets or sets the Title
-    /// </summary>
-    [JsonProperty("title")]
-    public string Title { get; set; }
-    /// <summary>
-    /// Gets or sets the Agenda
-    /// </summary>
-    [JsonProperty("agenda")]
-    public string Agenda { get; set; }
-
-    /// <summary>
-    /// Gets the meeting warning time span in minutes before the meeting starts
-    /// </summary>
-    [JsonProperty("meetingWarningMinutes")]
-    public TimeSpan MeetingWarningMinutes
-    {
-      get { return TimeSpan.FromMinutes(MinutesBeforeMeeting); }
-    }
-    /// <summary>
-    /// Gets the time remaining until the meeting starts
-    /// </summary>
-    [JsonProperty("timeToMeetingStart")]
-    public TimeSpan TimeToMeetingStart
-    {
-      get
-      {
-        return StartTime - DateTime.Now;
-      }
-    }
-    /// <summary>
-    /// Gets the time remaining until the meeting ends
-    /// </summary>
-    [JsonProperty("timeToMeetingEnd")]
-    public TimeSpan TimeToMeetingEnd
-    {
-      get
-      {
-        return EndTime - DateTime.Now;
-      }
-    }
-    /// <summary>
-    /// Gets or sets the StartTime
-    /// </summary>
-    [JsonProperty("startTime")]
-    public DateTime StartTime { get; set; }
-    /// <summary>
-    /// Gets or sets the EndTime
-    /// </summary>
-    [JsonProperty("endTime")]
-    public DateTime EndTime { get; set; }
-    /// <summary>
-    /// Gets the duration of the meeting
-    /// </summary>
-    [JsonProperty("duration")]
-    public TimeSpan Duration
-    {
-      get
-      {
-        return EndTime - StartTime;
-      }
-    }
-    /// <summary>
-    /// Gets or sets the Privacy
-    /// </summary>
-    [JsonProperty("privacy")]
-    public eMeetingPrivacy Privacy { get; set; }
-    /// <summary>
-    /// Gets a value indicating whether the meeting can be joined
-    /// </summary>
-    [JsonProperty("joinable")]
-    public bool Joinable
-    {
-      get
-      {
-        var joinable = StartTime.AddMinutes(-MinutesBeforeMeeting) <= DateTime.Now
-            && DateTime.Now <= EndTime.AddSeconds(-_joinableCooldownSeconds);
-        //Debug.LogMessage(LogEventLevel.Verbose, "Meeting Id: {0} joinable: {1}", Id, joinable);
-        return joinable;
-      }
-    }
-
-    /// <summary>
-    /// Gets or sets the Dialable
-    /// </summary>
-    [JsonProperty("dialable")]
-    public bool Dialable { get; set; }
-
-    //public string ConferenceNumberToDial { get; set; }
-
-    /// <summary>
-    /// Gets or sets the ConferencePassword
-    /// </summary>
-    [JsonProperty("conferencePassword")]
-    public string ConferencePassword { get; set; }
-
-    /// <summary>
-    /// Gets or sets the IsOneButtonToPushMeeting
-    /// </summary>
-    [JsonProperty("isOneButtonToPushMeeting")]
-    public bool IsOneButtonToPushMeeting { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Calls
-    /// </summary>
-    [JsonProperty("calls")]
-    public List<Call> Calls { get; private set; }
-
-    /// <summary>
-    /// Tracks the change types that have already been notified for
-    /// Gets or sets the NotifiedChangeTypes
-    /// </summary>
-    [JsonIgnore]
-    public eMeetingEventChangeType NotifiedChangeTypes { get; set; }
-
-    [JsonIgnore] private readonly int _joinableCooldownSeconds;
-
-    /// <summary>
-    /// Constructor for Meeting <see cref="Meeting"/>
-    /// </summary>
-    public Meeting()
-    {
-      Calls = new List<Call>();
-      _joinableCooldownSeconds = 300;
-    }
-
-    /// <summary>
-    /// Constructor for Meeting <see cref="Meeting"/>
-    /// </summary>
-    /// <param name="joinableCooldownSeconds">Number of seconds after meeting start when it is no longer joinable</param>
-    public Meeting(int joinableCooldownSeconds)
-    {
-      Calls = new List<Call>();
-      _joinableCooldownSeconds = joinableCooldownSeconds;
-    }
-
-
-
-    #region Overrides of Object
-
-    /// <summary>
-    /// ToString method
-    /// </summary>
-    /// <inheritdoc />
-    public override string ToString()
-    {
-      return string.Format("{0}:{1}: {2}-{3}", Title, Agenda, StartTime, EndTime);
-    }
-
-    #endregion
-  }
-
-}

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

@@ -1,22 +0,0 @@
-
-
-using System;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Represents a MeetingEventArgs
-  /// </summary>
-  public class MeetingEventArgs : EventArgs
-  {
-    /// <summary>
-    /// Gets or sets the ChangeType
-    /// </summary>
-    public eMeetingEventChangeType ChangeType { get; set; }
-    /// <summary>
-    /// Gets or sets the Meeting
-    /// </summary>
-    public Meeting Meeting { get; set; }
-  }
-
-}

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

@@ -1,4 +1,10 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
 
 {
     /// <summary>
@@ -6,20 +12,7 @@
     /// </summary>
     public enum eCodecCallDirection
     {
-        /// <summary>
-        /// Unknown call direction
-        /// </summary>
-        Unknown = 0,
-
-        /// <summary>
-        /// Incoming call direction
-        /// </summary>
-        Incoming,
-
-        /// <summary>
-        /// Outgoing call direction
-        /// </summary>
-        Outgoing
+        Unknown = 0, Incoming, Outgoing
     }
 
     /// <summary>

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

@@ -1,68 +1,27 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
 {
     /// <summary>
     /// Enumeration of eCodecCallStatus values
     /// </summary>
     public enum eCodecCallStatus
     {
-        /// <summary>
-        /// Unknown call status
-        /// </summary>
         Unknown = 0,
-
-        /// <summary>
-        /// Call is connected
-        /// </summary>
-        Connected,
-
-        /// <summary>
-        /// Call is connecting
-        /// </summary>
-        Connecting,
-
-        /// <summary>
-        /// Call is dialing
-        /// </summary>
-        Dialing,
-
-        /// <summary>
-        /// Call is disconnected
-        /// </summary>
+        Connected, 
+        Connecting, 
+        Dialing, 
         Disconnected,
-
-        /// <summary>
-        /// Call is disconnecting
-        /// </summary>
-        Disconnecting,
-
-        /// <summary>
-        /// Early media is being sent/received
-        /// </summary>
-        EarlyMedia,
-
-        /// <summary>
-        /// Call is idle
-        /// </summary>
+        Disconnecting, 
+        EarlyMedia, 
         Idle,
-
-        /// <summary>
-        /// Call is on hold
-        /// </summary>
-        OnHold,
-
-        /// <summary>
-        /// Call is ringing
-        /// </summary>
-        Ringing,
-
-        /// <summary>
-        /// Call is preserved
-        /// </summary>
-        Preserved,
-
-        /// <summary>
-        /// Call is remote preserved
-        /// </summary>
+        OnHold, 
+        Ringing, 
+        Preserved, 
         RemotePreserved,
     }
 

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

@@ -1,4 +1,10 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
 
 {
     /// <summary>
@@ -6,29 +12,10 @@
     /// </summary>
     public enum eCodecCallType
     {
-        /// <summary>
-        /// Unknown call type
-        /// </summary>
-        Unknown = 0,
-
-        /// <summary>
-        /// Audio-only call type
-        /// </summary>
-        Audio,
-
-        /// <summary>
-        /// Video call type
-        /// </summary>
-        Video,
-
-        /// <summary>
-        /// Audio call that can be escalated to video
-        /// </summary>
-        AudioCanEscalate,
-
-        /// <summary>
-        /// Forward all call type
-        /// </summary>
+        Unknown = 0, 
+        Audio, 
+        Video, 
+        AudioCanEscalate, 
         ForwardAllCall
     }
 

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

@@ -1,21 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Enumeration of eContactMethodCallType values
-  /// </summary>
-  public enum eContactMethodCallType
-  {
-    /// <summary>
-    /// Unknown call type
-    /// </summary>
-    Unknown = 0,
-    /// <summary>
-    /// Audio call type
-    /// </summary>
-    Audio,
-    /// <summary>
-    /// Video call type
-    /// </summary>
-    Video
-  }
-}

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

@@ -1,29 +0,0 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Enumeration of eContactMethodDevice values
-  /// </summary>
-  public enum eContactMethodDevice
-  {
-    /// <summary>
-    /// Unknown contact method
-    /// </summary>
-    Unknown = 0,
-    /// <summary>
-    /// Mobile contact method
-    /// </summary>
-    Mobile,
-    /// <summary>
-    /// Other contact method
-    /// </summary>
-    Other,
-    /// <summary>
-    /// Telephone contact method
-    /// </summary>
-    Telephone,
-    /// <summary>
-    /// Video contact method
-    /// </summary>
-    Video
-  }
-}

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

@@ -1,35 +0,0 @@
-
-
-using System;
-
-namespace PepperDash.Essentials.Devices.Common.Codec
-{
-  /// <summary>
-  /// Enumeration of eMeetingEventChangeType values
-  /// </summary>
-  [Flags]
-  public enum eMeetingEventChangeType
-  {
-    /// <summary>
-    /// Unknown change type
-    /// </summary>
-    Unknown = 0,
-    /// <summary>
-    /// Meeting start warning
-    /// </summary>
-    MeetingStartWarning = 1,
-    /// <summary>
-    /// Meeting start
-    /// </summary>
-    MeetingStart = 2,
-    /// <summary>
-    /// Meeting end warning
-    /// </summary>
-    MeetingEndWarning = 4,
-    /// <summary>
-    /// Meeting end
-    /// </summary>
-    MeetingEnd = 8
-  }
-
-}

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

@@ -1,23 +1,18 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
 {
     /// <summary>
     /// Enumeration of eMeetingPrivacy values
     /// </summary>
     public enum eMeetingPrivacy
     {
-        /// <summary>
-        /// Unknown meeting privacy level
-        /// </summary>
         Unknown = 0,
-
-        /// <summary>
-        /// Public meeting
-        /// </summary>
         Public,
-
-        /// <summary>
-        /// Private meeting
-        /// </summary>
         Private
     }
 

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

@@ -1,4 +1,10 @@
-using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {

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

@@ -1,4 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
@@ -7,9 +11,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public interface IHasCallFavorites
     {
-        /// <summary>
-        /// Gets the call favorites for this device
-        /// </summary>
         CodecCallFavorites CallFavorites { get; }
     }
 
@@ -23,9 +24,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         /// </summary>
         public List<CodecActiveCallItem> Favorites { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the CodecCallFavorites class
-        /// </summary>
         public CodecCallFavorites()
         {
             Favorites = new List<CodecActiveCallItem>();

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

@@ -2,9 +2,10 @@
 
 using System;
 using System.Collections.Generic;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
@@ -14,15 +15,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public interface IHasCallHistory
     {
-        /// <summary>
-        /// Gets the call history for this device
-        /// </summary>
         CodecCallHistory CallHistory { get; }
 
-        /// <summary>
-        /// Removes the specified call history entry
-        /// </summary>
-        /// <param name="entry">The call history entry to remove</param>
         void RemoveCallHistoryEntry(CodecCallHistory.CallHistoryEntry entry);
     }
 
@@ -31,24 +25,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public enum eCodecOccurrenceType
     {
-        /// <summary>
-        /// Unknown occurrence type
-        /// </summary>
         Unknown = 0,
-
-        /// <summary>
-        /// Call was placed (outgoing)
-        /// </summary>
         Placed = 1,
-
-        /// <summary>
-        /// Call was received (incoming)
-        /// </summary>
         Received = 2,
-
-        /// <summary>
-        /// Call received no answer
-        /// </summary>
         NoAnswer = 3,
     }
 
@@ -57,9 +36,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public class CodecCallHistory
     {
-        /// <summary>
-        /// Event that is raised when the recent calls list has changed
-        /// </summary>
         public event EventHandler<EventArgs> RecentCallsListHasChanged;
 
         /// <summary>
@@ -72,9 +48,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         /// </summary>
         CallHistoryEntry ListEmptyEntry;
 
-        /// <summary>
-        /// Initializes a new instance of the CodecCallHistory class
-        /// </summary>
         public CodecCallHistory()
         {
             ListEmptyEntry = new CallHistoryEntry() { Name = "No Recent Calls" };
@@ -107,22 +80,15 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         /// </summary>
         public class CallHistoryEntry : CodecActiveCallItem
         {
+            [JsonConverter(typeof(IsoDateTimeConverter))]
+            [JsonProperty("startTime")]
             /// <summary>
             /// Gets or sets the StartTime
             /// </summary>
-            [JsonConverter(typeof(IsoDateTimeConverter))]
-            [JsonProperty("startTime")]
             public DateTime StartTime { get; set; }
-            /// <summary>
-            /// Gets or sets the occurrence type for this call history entry
-            /// </summary>
             [JsonConverter(typeof(StringEnumConverter))]
             [JsonProperty("occurrenceType")]
             public eCodecOccurrenceType OccurrenceType { get; set; }
-
-            /// <summary>
-            /// Gets or sets the occurrence history identifier
-            /// </summary>
             [JsonProperty("occurrenceHistoryId")]
             public string OccurrenceHistoryId { get; set; }
         }
@@ -153,7 +119,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             }
 
             // Check if list is empty and if so, add an item to display No Recent Calls
-            if (genericEntries.Count == 0)
+            if(genericEntries.Count == 0)
                 genericEntries.Add(ListEmptyEntry);
 
             RecentCalls = genericEntries;

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

@@ -1,4 +1,11 @@
-using PepperDash.Essentials.Core;
+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.Codec
@@ -8,29 +15,12 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public interface IHasContentSharing
     {
-        /// <summary>
-        /// Gets feedback indicating whether content sharing is currently active
-        /// </summary>
         BoolFeedback SharingContentIsOnFeedback { get; }
-
-        /// <summary>
-        /// Gets feedback about the current sharing source
-        /// </summary>
         StringFeedback SharingSourceFeedback { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether content should be automatically shared while in a call
-        /// </summary>
         bool AutoShareContentWhileInCall { get; }
 
-        /// <summary>
-        /// Starts content sharing
-        /// </summary>
         void StartSharing();
-
-        /// <summary>
-        /// Stops content sharing
-        /// </summary>
         void StopSharing();
     }
 

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

@@ -1,4 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
@@ -9,49 +15,15 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     {
         // Add requirements for Dialer functionality
 
-        /// <summary>
-        /// Event that is raised when call status changes
-        /// </summary>
         event EventHandler<CodecCallStatusItemChangeEventArgs> CallStatusChange;
 
-        /// <summary>
-        /// Dials the specified number
-        /// </summary>
-        /// <param name="number">The number to dial</param>
         void Dial(string number);
-
-        /// <summary>
-        /// Ends the specified active call
-        /// </summary>
-        /// <param name="activeCall">The active call to end</param>
         void EndCall(CodecActiveCallItem activeCall);
-
-        /// <summary>
-        /// Ends all active calls
-        /// </summary>
         void EndAllCalls();
-
-        /// <summary>
-        /// Accepts the specified incoming call
-        /// </summary>
-        /// <param name="item">The call item to accept</param>
         void AcceptCall(CodecActiveCallItem item);
-
-        /// <summary>
-        /// Rejects the specified incoming call
-        /// </summary>
-        /// <param name="item">The call item to reject</param>
         void RejectCall(CodecActiveCallItem item);
-
-        /// <summary>
-        /// Sends DTMF digits during a call
-        /// </summary>
-        /// <param name="digit">The DTMF digit(s) to send</param>
         void SendDtmf(string digit);
 
-        /// <summary>
-        /// Gets a value indicating whether the device is currently in a call
-        /// </summary>
         bool IsInCall { get; }
     }
 

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

@@ -1,59 +1,319 @@
 
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
-    /// <summary>
-    /// Defines the API for codecs with a directory
-    /// </summary>
+	/// <summary>
+	/// Defines the API for codecs with a directory
+	/// </summary>
     public interface IHasDirectory
     {
-        /// <summary>
-        /// Event that fires when a directory result is returned from the codec
-        /// </summary>
         event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
 
-        /// <summary>
-        /// Gets the DirectoryRoot
-        /// </summary>
         CodecDirectory DirectoryRoot { get; }
 
-        /// <summary>
-        /// Gets the CurrentDirectoryResult
-        /// </summary>
         CodecDirectory CurrentDirectoryResult { get; }
 
-        /// <summary>
-        /// Gets the PhonebookSyncState
-        /// </summary>
         CodecPhonebookSyncState PhonebookSyncState { get; }
 
-        /// <summary>
-        /// Method to initiate a search of the directory on the server
-        /// </summary>
         void SearchDirectory(string searchString);
 
-        /// <summary>
-        /// Method to get the contents of a specific folder in the directory on the server
-        /// </summary>
         void GetDirectoryFolderContents(string folderId);
 
-        /// <summary>
-        /// Method to set the current directory to the root folder
-        /// </summary>
         void SetCurrentDirectoryToRoot();
 
-        /// <summary>
-        /// Method to get the contents of the parent folder in the directory on the server
-        /// </summary>
         void GetDirectoryParentFolderContents();
 
-        /// <summary>
-        /// Gets the CurrentDirectoryResultIsNotDirectoryRoot
-        /// </summary>
         BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; }
     }
+
+    /// <summary>
+    /// Defines the contract for IHasDirectoryHistoryStack
+    /// </summary>
+    public interface IHasDirectoryHistoryStack : IHasDirectory
+    {
+        Stack<CodecDirectory> DirectoryBrowseHistoryStack { get; } 
+    }
+
+
+    /// <summary>
+    /// Represents a DirectoryEventArgs
+    /// </summary>
+    public class DirectoryEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the Directory
+        /// </summary>
+        public CodecDirectory Directory { get; set; }
+        /// <summary>
+        /// Gets or sets the DirectoryIsOnRoot
+        /// </summary>
+        public bool DirectoryIsOnRoot { get; set; }
+    }
+
+	/// <summary>
+	/// Represents a codec directory
+	/// </summary>
+    public class CodecDirectory
+    {
+        /// <summary>
+        /// Represents the contents of the directory
+        /// We don't want to serialize this for messages to MobileControl.  MC can combine Contacts and Folders to get the same data
+        /// </summary>
+		[JsonIgnore]
+        public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
+
+        [JsonProperty("contacts")]
+        public List<DirectoryItem> Contacts
+        {
+            get
+            {
+                return CurrentDirectoryResults.OfType<DirectoryContact>().Cast<DirectoryItem>().ToList();
+            }
+        }
+
+        [JsonProperty("folders")]
+        public List<DirectoryItem> Folders
+        {
+            get
+            {
+                return CurrentDirectoryResults.OfType<DirectoryFolder>().Cast<DirectoryItem>().ToList();
+            }
+        }
+
+        /// <summary>
+        /// Used to store the ID of the current folder for CurrentDirectoryResults
+        /// </summary>
+		[JsonProperty("resultsFolderId")]
+        /// <summary>
+        /// Gets or sets the ResultsFolderId
+        /// </summary>
+        public string ResultsFolderId { get; set; }
+
+        public CodecDirectory()
+        {
+            CurrentDirectoryResults = new List<DirectoryItem>();
+        }
+
+        /// <summary>
+        /// Adds folders to the directory
+        /// </summary>
+        /// <param name="folders"></param>
+        /// <summary>
+        /// AddFoldersToDirectory method
+        /// </summary>
+        public void AddFoldersToDirectory(List<DirectoryItem> folders)
+        {
+            if(folders != null)
+                CurrentDirectoryResults.AddRange(folders);
+
+            SortDirectory();
+        }
+
+        /// <summary>
+        /// Adds contacts to the directory
+        /// </summary>
+        /// <param name="contacts"></param>
+        /// <summary>
+        /// AddContactsToDirectory method
+        /// </summary>
+        public void AddContactsToDirectory(List<DirectoryItem> contacts)
+        {
+            if(contacts != null)
+                CurrentDirectoryResults.AddRange(contacts);
+
+            SortDirectory();
+        }
+
+        /// <summary>
+        /// Filters the CurrentDirectoryResults by the predicate
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <summary>
+        /// FilterContacts method
+        /// </summary>
+        public void FilterContacts(Func<DirectoryItem, bool> predicate)
+        {
+            CurrentDirectoryResults = CurrentDirectoryResults.Where(predicate).ToList();
+        }
+
+        /// <summary>
+        /// Sorts the DirectoryResults list to display all folders alphabetically, then all contacts alphabetically
+        /// </summary>
+        private void SortDirectory()
+        {
+            var sortedFolders = new List<DirectoryItem>();
+
+            sortedFolders.AddRange(CurrentDirectoryResults.Where(f => f is DirectoryFolder));
+
+            sortedFolders.OrderBy(f => f.Name);
+
+            var sortedContacts = new List<DirectoryItem>();
+
+            sortedContacts.AddRange(CurrentDirectoryResults.Where(c => c is DirectoryContact));
+
+            sortedFolders.OrderBy(c => c.Name);
+
+            CurrentDirectoryResults.Clear();
+
+            CurrentDirectoryResults.AddRange(sortedFolders);
+
+            CurrentDirectoryResults.AddRange(sortedContacts);
+        }
+
+    }
+
+    /// <summary>
+    /// Defines the contract for IInvitableContact
+    /// </summary>
+    public interface IInvitableContact
+    {
+        bool IsInvitableContact { get; }
+    }
+
+    public class InvitableDirectoryContact : DirectoryContact, IInvitableContact
+    {
+        [JsonProperty("isInvitableContact")]
+        public bool IsInvitableContact
+        {
+            get
+            {
+                return this is IInvitableContact;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Represents a DirectoryItem
+    /// </summary>
+    public class DirectoryItem : ICloneable
+    {
+        /// <summary>
+        /// Clone method
+        /// </summary>
+        public object Clone()
+        {
+            return this.MemberwiseClone();
+        }
+
+        [JsonProperty("folderId")]
+        public string FolderId { get; set; }
+
+		[JsonProperty("name")]	
+        /// <summary>
+        /// Gets or sets the Name
+        /// </summary>
+        public string Name { get; set; }
+
+        [JsonProperty("parentFolderId")]
+        /// <summary>
+        /// Gets or sets the ParentFolderId
+        /// </summary>
+        public string ParentFolderId { get; set; }
+    }
+
+    /// <summary>
+    /// Represents a DirectoryFolder
+    /// </summary>
+    public class DirectoryFolder : DirectoryItem
+    {
+		[JsonProperty("contacts")]
+        /// <summary>
+        /// Gets or sets the Contacts
+        /// </summary>
+        public List<DirectoryContact> Contacts { get; set; }
+
+
+        public DirectoryFolder()
+        {
+            Contacts = new List<DirectoryContact>();
+        }
+    }
+
+    /// <summary>
+    /// Represents a DirectoryContact
+    /// </summary>
+    public class DirectoryContact : DirectoryItem
+    {
+		[JsonProperty("contactId")]
+        /// <summary>
+        /// Gets or sets the ContactId
+        /// </summary>
+        public string ContactId { get; set; } 
+
+		[JsonProperty("title")]
+        public string Title { get; set; }
+
+		[JsonProperty("contactMethods")]
+        public List<ContactMethod> ContactMethods { get; set; }
+
+        public DirectoryContact()
+        {
+            ContactMethods = new List<ContactMethod>();
+        }
+    }
+
+    /// <summary>
+    /// Represents a ContactMethod
+    /// </summary>
+    public class ContactMethod
+    {
+		[JsonProperty("contactMethodId")]
+        /// <summary>
+        /// Gets or sets the ContactMethodId
+        /// </summary>
+        public string ContactMethodId { get; set; }
+
+		[JsonProperty("number")]
+        public string Number { get; set; }
+        
+		[JsonProperty("device")]
+		[JsonConverter(typeof(StringEnumConverter))]
+  /// <summary>
+  /// Gets or sets the Device
+  /// </summary>
+		public eContactMethodDevice Device { get; set; }
+
+		[JsonProperty("callType")]
+		[JsonConverter(typeof(StringEnumConverter))]
+  /// <summary>
+  /// Gets or sets the CallType
+  /// </summary>
+		public eContactMethodCallType CallType { get; set; }
+    }
+
+    /// <summary>
+    /// Enumeration of eContactMethodDevice values
+    /// </summary>
+    public enum eContactMethodDevice
+    {
+        Unknown = 0,
+        Mobile,
+        Other,
+        Telephone,
+        Video
+    }
+	
+    /// <summary>
+    /// Enumeration of eContactMethodCallType values
+    /// </summary>
+    public enum eContactMethodCallType
+    {
+        Unknown = 0,
+        Audio,
+        Video
+    }
 }

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

@@ -1,20 +1,339 @@
-namespace PepperDash.Essentials.Devices.Common.Codec
+
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+using Newtonsoft.Json;
+using Serilog.Events;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
 {
+    [Flags]
+    /// <summary>
+    /// Enumeration of eMeetingEventChangeType values
+    /// </summary>
+    public enum eMeetingEventChangeType
+    {
+        Unknown = 0,
+        MeetingStartWarning = 1,
+        MeetingStart = 2,
+        MeetingEndWarning = 4,
+        MeetingEnd = 8
+    }
 
     /// <summary>
     /// Defines the contract for IHasScheduleAwareness
     /// </summary>
     public interface IHasScheduleAwareness
     {
-        /// <summary>
-        /// Gets the CodecScheduleAwareness instance
-        /// </summary>
         CodecScheduleAwareness CodecSchedule { get; }
 
-        /// <summary>
-        /// Method to initiate getting the schedule from the server
-        /// </summary>
         void GetSchedule();
     }
 
+    /// <summary>
+    /// Represents a CodecScheduleAwareness
+    /// </summary>
+    public class CodecScheduleAwareness
+    {
+        List<Meeting> _meetings;
+
+        public event EventHandler<MeetingEventArgs> MeetingEventChange;
+
+        public event EventHandler<EventArgs> MeetingsListHasChanged;
+
+        private int _meetingWarningMinutes = 5;
+
+        //private Meeting _previousChangedMeeting;
+
+        //private eMeetingEventChangeType _previousChangeType = eMeetingEventChangeType.Unknown;
+
+        public int MeetingWarningMinutes
+        {
+            get { return _meetingWarningMinutes; }
+            set { _meetingWarningMinutes = value; }
+        }
+
+        /// <summary>
+		/// Setter triggers MeetingsListHasChanged event
+		/// </summary>
+        public List<Meeting> Meetings
+        {
+            get
+            {
+                return _meetings;
+            }
+            set
+            {
+                _meetings = value;
+                MeetingsListHasChanged?.Invoke(this, new EventArgs());
+            }
+        }
+
+        private readonly CTimer _scheduleChecker;
+
+        public CodecScheduleAwareness()
+        {
+            Meetings = new List<Meeting>();
+
+            _scheduleChecker = new CTimer(CheckSchedule, null, 1000, 1000);
+        }
+
+        public CodecScheduleAwareness(long pollTime)
+        {
+            Meetings = new List<Meeting>();
+
+            _scheduleChecker = new CTimer(CheckSchedule, null, pollTime, pollTime);
+        }
+
+        /// <summary>
+        /// Helper method to fire MeetingEventChange.  Should only fire once for each changeType on each meeting
+        /// </summary>
+        /// <param name="changeType"></param>
+        /// <param name="meeting"></param>
+        private void OnMeetingChange(eMeetingEventChangeType changeType, Meeting meeting)
+        {
+            Debug.LogMessage(LogEventLevel.Verbose, "*****************OnMeetingChange.  id: {0} changeType: {1}**********************", meeting.Id, changeType);
+            if (changeType != (changeType & meeting.NotifiedChangeTypes))
+            {
+                // Add this change type to the NotifiedChangeTypes
+                meeting.NotifiedChangeTypes |= changeType;
+                MeetingEventChange?.Invoke(this, new MeetingEventArgs() { ChangeType = changeType, Meeting = meeting });
+            }
+            else
+            {
+                Debug.LogMessage(LogEventLevel.Verbose, "Meeting: {0} already notified of changeType: {1}", meeting.Id, changeType);
+            }
+        }
+
+
+        /// <summary>
+        /// Checks the schedule to see if any MeetingEventChange updates should be fired
+        /// </summary>
+        /// <param name="o"></param>
+        private void CheckSchedule(object o)
+        {
+            //  Iterate the meeting list and check if any meeting need to do anything
+
+            const double meetingTimeEpsilon = 0.05;
+            foreach (var m in Meetings)
+            {
+                var changeType = eMeetingEventChangeType.Unknown;
+
+                if (eMeetingEventChangeType.MeetingStartWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStartWarning) && m.TimeToMeetingStart.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingStart.Seconds > 0)       // Meeting is about to start
+                {
+                    Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingStartWarning. TotalMinutes: {0}  Seconds: {1}", m.TimeToMeetingStart.TotalMinutes, m.TimeToMeetingStart.Seconds);
+                    changeType = eMeetingEventChangeType.MeetingStartWarning;
+                }
+                else if (eMeetingEventChangeType.MeetingStart != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStart) && Math.Abs(m.TimeToMeetingStart.TotalMinutes) < meetingTimeEpsilon)           // Meeting Start
+                {
+                    Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingStart");
+                    changeType = eMeetingEventChangeType.MeetingStart;
+                }
+                else if (eMeetingEventChangeType.MeetingEndWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEndWarning) && m.TimeToMeetingEnd.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingEnd.Seconds > 0)    // Meeting is about to end
+                {
+                    Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingEndWarning. TotalMinutes: {0}  Seconds: {1}", m.TimeToMeetingEnd.TotalMinutes, m.TimeToMeetingEnd.Seconds);
+                    changeType = eMeetingEventChangeType.MeetingEndWarning;
+                }
+                else if (eMeetingEventChangeType.MeetingEnd != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEnd) && Math.Abs(m.TimeToMeetingEnd.TotalMinutes) < meetingTimeEpsilon)             // Meeting has ended
+                {
+                    Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingEnd");
+                    changeType = eMeetingEventChangeType.MeetingEnd;
+                }
+
+                if (changeType != eMeetingEventChangeType.Unknown)
+                {
+                    OnMeetingChange(changeType, m);                    
+                }
+            }
+
+        }
+    }
+
+    /// <summary>
+    /// Represents a Meeting
+    /// </summary>
+    public class Meeting
+    {
+        [JsonProperty("minutesBeforeMeeting")]
+        public int MinutesBeforeMeeting;
+
+        [JsonProperty("id")]
+        public string Id { get; set; }
+        [JsonProperty("organizer")]
+        public string Organizer { get; set; }
+        [JsonProperty("title")]
+        /// <summary>
+        /// Gets or sets the Title
+        /// </summary>
+        public string Title { get; set; }
+        [JsonProperty("agenda")]
+        /// <summary>
+        /// Gets or sets the Agenda
+        /// </summary>
+        public string Agenda { get; set; }
+
+        [JsonProperty("meetingWarningMinutes")]
+        public TimeSpan MeetingWarningMinutes
+        {
+            get { return TimeSpan.FromMinutes(MinutesBeforeMeeting); }
+        }
+        [JsonProperty("timeToMeetingStart")]
+        public TimeSpan TimeToMeetingStart
+        {
+            get
+            {
+                return StartTime - DateTime.Now;
+            }
+        }
+        [JsonProperty("timeToMeetingEnd")]
+        public TimeSpan TimeToMeetingEnd
+        {
+            get
+            {
+                return EndTime - DateTime.Now;
+            }
+        }
+        [JsonProperty("startTime")]
+        /// <summary>
+        /// Gets or sets the StartTime
+        /// </summary>
+        public DateTime StartTime { get; set; }
+        [JsonProperty("endTime")]
+        /// <summary>
+        /// Gets or sets the EndTime
+        /// </summary>
+        public DateTime EndTime { get; set; }
+        [JsonProperty("duration")]
+        public TimeSpan Duration
+        {
+            get
+            {
+                return EndTime - StartTime;
+            }
+        }
+        [JsonProperty("privacy")]
+        /// <summary>
+        /// Gets or sets the Privacy
+        /// </summary>
+        public eMeetingPrivacy Privacy { get; set; }
+        [JsonProperty("joinable")]
+        public bool Joinable
+        {
+            get
+            {
+                var joinable = StartTime.AddMinutes(-MinutesBeforeMeeting) <= DateTime.Now
+                    && DateTime.Now <= EndTime.AddSeconds(-_joinableCooldownSeconds);
+                //Debug.LogMessage(LogEventLevel.Verbose, "Meeting Id: {0} joinable: {1}", Id, joinable);
+                return joinable;
+            }
+        }
+
+		[JsonProperty("dialable")]
+  /// <summary>
+  /// Gets or sets the Dialable
+  /// </summary>
+		public bool Dialable { get; set; }
+
+        //public string ConferenceNumberToDial { get; set; }
+        [JsonProperty("conferencePassword")]
+        /// <summary>
+        /// Gets or sets the ConferencePassword
+        /// </summary>
+        public string ConferencePassword { get; set; }
+        [JsonProperty("isOneButtonToPushMeeting")]
+        /// <summary>
+        /// Gets or sets the IsOneButtonToPushMeeting
+        /// </summary>
+        public bool IsOneButtonToPushMeeting { get; set; }
+
+        [JsonProperty("calls")]
+        /// <summary>
+        /// Gets or sets the Calls
+        /// </summary>
+        public List<Call> Calls { get; private set; }
+
+        /// <summary>
+        /// Tracks the change types that have already been notified for
+        /// </summary>
+        [JsonIgnore]
+        /// <summary>
+        /// Gets or sets the NotifiedChangeTypes
+        /// </summary>
+        public eMeetingEventChangeType NotifiedChangeTypes { get; set; }
+
+        [JsonIgnore] private readonly int _joinableCooldownSeconds;
+
+
+        public Meeting()
+        {
+            Calls = new List<Call>();
+            _joinableCooldownSeconds = 300;
+        }
+
+        public Meeting(int joinableCooldownSeconds)
+        {
+            Calls = new List<Call>();
+            _joinableCooldownSeconds = joinableCooldownSeconds;
+        }
+
+
+
+        #region Overrides of Object
+
+        /// <summary>
+        /// ToString method
+        /// </summary>
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return String.Format("{0}:{1}: {2}-{3}", Title, Agenda, StartTime, EndTime);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents a Call
+    /// </summary>
+    public class Call
+    {
+        /// <summary>
+        /// Gets or sets the Number
+        /// </summary>
+        public string Number { get; set; }
+        /// <summary>
+        /// Gets or sets the Protocol
+        /// </summary>
+        public string Protocol { get; set; }
+        /// <summary>
+        /// Gets or sets the CallRate
+        /// </summary>
+        public string CallRate { get; set; }
+        /// <summary>
+        /// Gets or sets the CallType
+        /// </summary>
+        public string CallType { get; set; }
+    }
+
+    /// <summary>
+    /// Represents a MeetingEventArgs
+    /// </summary>
+    public class MeetingEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the ChangeType
+        /// </summary>
+        public eMeetingEventChangeType ChangeType { get; set; }
+        /// <summary>
+        /// Gets or sets the Meeting
+        /// </summary>
+        public Meeting Meeting { get; set; }
+    }
+
 }

src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs

@@ -1,84 +1,61 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.DSP
 {
-    /// <summary>
-    /// Base class for DSP devices
-    /// </summary>
-    public abstract class DspBase : EssentialsDevice, ILevelControls
-    {
-        /// <summary>
-        /// Gets the collection of level control points
-        /// </summary>
-        public Dictionary<string, IBasicVolumeWithFeedback> LevelControlPoints { get; private set; }
+	public abstract class DspBase : EssentialsDevice, ILevelControls
+	{
+		public Dictionary<string,IBasicVolumeWithFeedback> LevelControlPoints { get; private set; }
 
-        /// <summary>
-        /// Gets the collection of dialer control points
-        /// </summary>
         public Dictionary<string, DspControlPoint> DialerControlPoints { get; private set; }
 
-        /// <summary>
-        /// Gets the collection of switcher control points
-        /// </summary>
         public Dictionary<string, DspControlPoint> SwitcherControlPoints { get; private set; }
 
-        /// <summary>
-        /// Initializes a new instance of the DspBase class
-        /// </summary>
-        /// <param name="key">The device key</param>
-        /// <param name="name">The device name</param>
-        public DspBase(string key, string name) :
-                base(key, name)
-        {
+		public DspBase(string key, string name) :
+				base(key, name)
+		{
 
-            LevelControlPoints = new Dictionary<string, IBasicVolumeWithFeedback>();
-            DialerControlPoints = new Dictionary<string, DspControlPoint>();
-            SwitcherControlPoints = new Dictionary<string, DspControlPoint>();
-        }
+			LevelControlPoints = new Dictionary<string, IBasicVolumeWithFeedback>();
+			DialerControlPoints = new Dictionary<string, DspControlPoint>();
+			SwitcherControlPoints = new Dictionary<string, DspControlPoint>();
+	    }
 
 
-        // in audio call feedback
+		// in audio call feedback
 
-        // VOIP
-        // Phone dialer
+		// VOIP
+		// Phone dialer
 
-    }
+	}
 
-    // Fusion
-    // Privacy state
-    // Online state
-    // level/mutes ?
+	// Fusion
+	// Privacy state
+	// Online state
+	// level/mutes ?
+	
+	// AC Log call stats
+	
+		// Typical presets:
+		// call default preset to restore levels and mutes
 
-    // AC Log call stats
-
-    // Typical presets:
-    // call default preset to restore levels and mutes
-
-    /// <summary>
-    /// Base class for DSP control points
-    /// </summary>
-    public abstract class DspControlPoint : IKeyed
-    {
+	public abstract class DspControlPoint :IKeyed
+	{
         /// <summary>
         /// Gets or sets the Key
         /// </summary>
         public string Key { get; }
 
-        /// <summary>
-        /// Initializes a new instance of the DspControlPoint class
-        /// </summary>
-        /// <param name="key">The control point key</param>
         protected DspControlPoint(string key) => Key = key;
-    }
+	}
 
-    /// <summary>
-    /// Base class for DSP level control points with volume and mute functionality
-    /// </summary>
-    public abstract class DspLevelControlPoint : DspControlPoint, IBasicVolumeWithFeedback
+    public abstract class DspLevelControlPoint :DspControlPoint, IBasicVolumeWithFeedback
     {
         /// <summary>
         /// Gets or sets the MuteFeedback
@@ -89,63 +66,30 @@ namespace PepperDash.Essentials.Devices.Common.DSP
         /// </summary>
         public IntFeedback VolumeLevelFeedback { get; }
 
-        /// <summary>
-        /// Initializes a new instance of the DspLevelControlPoint class
-        /// </summary>
-        /// <param name="key">The control point key</param>
-        /// <param name="muteFeedbackFunc">Function to get mute status</param>
-        /// <param name="volumeLevelFeedbackFunc">Function to get volume level</param>
         protected DspLevelControlPoint(string key, Func<bool> muteFeedbackFunc, Func<int> volumeLevelFeedbackFunc) : base(key)
         {
-            MuteFeedback = new BoolFeedback("mute", muteFeedbackFunc);
-            VolumeLevelFeedback = new IntFeedback("volume", volumeLevelFeedbackFunc);
+            MuteFeedback = new BoolFeedback(muteFeedbackFunc);
+            VolumeLevelFeedback = new IntFeedback(volumeLevelFeedbackFunc);
         }
 
-        /// <summary>
-        /// Turns mute off
-        /// </summary>
         public abstract void MuteOff();
-        /// <summary>
-        /// Turns mute on
-        /// </summary>
         public abstract void MuteOn();
-        /// <summary>
-        /// Toggles mute state
-        /// </summary>
         public abstract void MuteToggle();
-        /// <summary>
-        /// Sets the volume level
-        /// </summary>
-        /// <param name="level">The volume level to set</param>
         public abstract void SetVolume(ushort level);
-        /// <summary>
-        /// Decreases volume
-        /// </summary>
-        /// <param name="pressRelease">True when pressed, false when released</param>
         public abstract void VolumeDown(bool pressRelease);
-        /// <summary>
-        /// Increases volume
-        /// </summary>
-        /// <param name="pressRelease">True when pressed, false when released</param>
         public abstract void VolumeUp(bool pressRelease);
     }
 
-    /// <summary>
-    /// Base class for DSP dialer control points
-    /// </summary>
-    public abstract class DspDialerBase : DspControlPoint
-    {
-        /// <summary>
-        /// Initializes a new instance of the DspDialerBase class
-        /// </summary>
-        /// <param name="key">The dialer control point key</param>
+
+    public abstract class DspDialerBase:DspControlPoint
+	{
         protected DspDialerBase(string key) : base(key) { }
-    }
+	}
 
 
-    // Main program 
-    // VTC 
-    // ATC
-    // Mics, unusual
+	// Main program 
+	// VTC 
+	// ATC
+	// Mics, unusual
 
 }

src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs

@@ -14,9 +14,7 @@ namespace PepperDash.Essentials.Devices.Common
     /// </summary>
     public class DeviceFactory
     {
-        /// <summary>
-        /// Initializes a new instance of the DeviceFactory class
-        /// </summary>
+
         public DeviceFactory()
         {
             var assy = Assembly.GetExecutingAssembly();

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

@@ -11,53 +11,37 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Displays
 {
-	/// <summary>
-	/// Represents a BasicIrDisplay
-	/// </summary>
-	public class BasicIrDisplay : DisplayBase, IBasicVolumeControls, IBridgeAdvanced
+    /// <summary>
+    /// Represents a BasicIrDisplay
+    /// </summary>
+    public class BasicIrDisplay : DisplayBase, IBasicVolumeControls, IBridgeAdvanced
 	{
-		/// <summary>
-		/// Gets or sets the IrPort
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the IrPort
+  /// </summary>
 		public IrOutputPortController IrPort { get; private set; }
-		/// <summary>
-		/// Gets or sets the IrPulseTime
-		/// </summary>
+  /// <summary>
+  /// Gets or sets the IrPulseTime
+  /// </summary>
 		public ushort IrPulseTime { get; set; }
 
-		/// <summary>
-		/// Gets the power is on feedback function
-		/// </summary>
-		protected Func<bool> PowerIsOnFeedbackFunc
-		{
-			get { return () => _PowerIsOn; }
-		}
-		/// <summary>
-		/// Gets the is cooling down feedback function
-		/// </summary>
+        protected Func<bool> PowerIsOnFeedbackFunc
+        {
+            get { return () => _PowerIsOn; }
+        }
 		protected override Func<bool> IsCoolingDownFeedbackFunc
 		{
 			get { return () => _IsCoolingDown; }
 		}
-		/// <summary>
-		/// Gets the is warming up feedback function
-		/// </summary>
 		protected override Func<bool> IsWarmingUpFeedbackFunc
 		{
 			get { return () => _IsWarmingUp; }
 		}
 
-		bool _PowerIsOn;
+        bool _PowerIsOn;
 		bool _IsWarmingUp;
 		bool _IsCoolingDown;
 
-		/// <summary>
-		/// Initializes a new instance of the BasicIrDisplay class
-		/// </summary>
-		/// <param name="key">The device key</param>
-		/// <param name="name">The device name</param>
-		/// <param name="port">The IR output port</param>
-		/// <param name="irDriverFilepath">The path to the IR driver file</param>
 		public BasicIrDisplay(string key, string name, IROutputPort port, string irDriverFilepath)
 			: base(key, name)
 		{
@@ -69,74 +53,74 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
 			InputPorts.AddRange(new RoutingPortCollection<RoutingInputPort>
 			{
-				new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi1), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi2), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi3), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn4, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				new RoutingInputPort(RoutingPortNames.HdmiIn4, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi4), this, false),
-				new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 					eRoutingPortConnectionType.Hdmi, new Action(Component1), this, false),
-				new RoutingInputPort(RoutingPortNames.CompositeIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				new RoutingInputPort(RoutingPortNames.CompositeIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 					eRoutingPortConnectionType.Hdmi, new Action(Video1), this, false),
-				new RoutingInputPort(RoutingPortNames.AntennaIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+				new RoutingInputPort(RoutingPortNames.AntennaIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 					eRoutingPortConnectionType.Hdmi, new Action(Antenna), this, false),
 			});
 		}
 
-		/// <summary>
-		/// Hdmi1 method
-		/// </summary>
+  /// <summary>
+  /// Hdmi1 method
+  /// </summary>
 		public void Hdmi1()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_1, IrPulseTime);
 		}
 
-		/// <summary>
-		/// Hdmi2 method
-		/// </summary>
+  /// <summary>
+  /// Hdmi2 method
+  /// </summary>
 		public void Hdmi2()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_2, IrPulseTime);
 		}
 
-		/// <summary>
-		/// Hdmi3 method
-		/// </summary>
+  /// <summary>
+  /// Hdmi3 method
+  /// </summary>
 		public void Hdmi3()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_3, IrPulseTime);
 		}
 
-		/// <summary>
-		/// Hdmi4 method
-		/// </summary>
+  /// <summary>
+  /// Hdmi4 method
+  /// </summary>
 		public void Hdmi4()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_HDMI_4, IrPulseTime);
 		}
 
-		/// <summary>
-		/// Component1 method
-		/// </summary>
+  /// <summary>
+  /// Component1 method
+  /// </summary>
 		public void Component1()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_COMPONENT_1, IrPulseTime);
 		}
 
-		/// <summary>
-		/// Video1 method
-		/// </summary>
+  /// <summary>
+  /// Video1 method
+  /// </summary>
 		public void Video1()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_VIDEO_1, IrPulseTime);
 		}
 
-		/// <summary>
-		/// Antenna method
-		/// </summary>
+  /// <summary>
+  /// Antenna method
+  /// </summary>
 		public void Antenna()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_ANTENNA, IrPulseTime);
@@ -144,31 +128,31 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
 		#region IPower Members
 
-		/// <summary>
-		/// PowerOn method
-		/// </summary>
-		/// <inheritdoc />
+  /// <summary>
+  /// PowerOn method
+  /// </summary>
+  /// <inheritdoc />
 		public override void PowerOn()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_ON, IrPulseTime);
-			_PowerIsOn = true;
+            _PowerIsOn = true;
 		}
 
-		/// <summary>
-		/// PowerOff method
-		/// </summary>
+  /// <summary>
+  /// PowerOff method
+  /// </summary>
 		public override void PowerOff()
 		{
-			_PowerIsOn = false;
+            _PowerIsOn = false;
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER_OFF, IrPulseTime);
 		}
 
-		/// <summary>
-		/// PowerToggle method
-		/// </summary>
+  /// <summary>
+  /// PowerToggle method
+  /// </summary>
 		public override void PowerToggle()
 		{
-			_PowerIsOn = false;
+            _PowerIsOn = false;
 			IrPort.Pulse(IROutputStandardCommands.IROut_POWER, IrPulseTime);
 		}
 
@@ -176,25 +160,25 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
 		#region IBasicVolumeControls Members
 
-		/// <summary>
-		/// VolumeUp method
-		/// </summary>
+  /// <summary>
+  /// VolumeUp method
+  /// </summary>
 		public void VolumeUp(bool pressRelease)
 		{
 			IrPort.PressRelease(IROutputStandardCommands.IROut_VOL_PLUS, pressRelease);
 		}
 
-		/// <summary>
-		/// VolumeDown method
-		/// </summary>
+  /// <summary>
+  /// VolumeDown method
+  /// </summary>
 		public void VolumeDown(bool pressRelease)
 		{
 			IrPort.PressRelease(IROutputStandardCommands.IROut_VOL_MINUS, pressRelease);
 		}
 
-		/// <summary>
-		/// MuteToggle method
-		/// </summary>
+  /// <summary>
+  /// MuteToggle method
+  /// </summary>
 		public void MuteToggle()
 		{
 			IrPort.Pulse(IROutputStandardCommands.IROut_MUTE, 200);
@@ -206,8 +190,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		{
 			_IsWarmingUp = true;
 			IsWarmingUpFeedback.FireUpdate();
-			new CTimer(o =>
-			{
+			new CTimer(o => {
 				_IsWarmingUp = false;
 				IsWarmingUpFeedback.FireUpdate();
 			}, 10000);
@@ -230,13 +213,13 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		/// Typically called by the discovery routing algorithm.
 		/// </summary>
 		/// <param name="inputSelector">A delegate containing the input selector method to call</param>
-		/// <summary>
-		/// ExecuteSwitch method
-		/// </summary>
-		/// <inheritdoc />
+  /// <summary>
+  /// ExecuteSwitch method
+  /// </summary>
+  /// <inheritdoc />
 		public override void ExecuteSwitch(object inputSelector)
 		{
-			Debug.LogMessage(LogEventLevel.Verbose, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
+            Debug.LogMessage(LogEventLevel.Verbose, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
 
 			Action finishSwitch = () =>
 				{
@@ -263,45 +246,42 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
 		#endregion
 
-		/// <summary>
-		/// LinkToApi method
-		/// </summary>
-		public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-		{
-			LinkDisplayToApi(this, trilist, joinStart, joinMapKey, bridge);
-		}
+     /// <summary>
+     /// LinkToApi method
+     /// </summary>
+	    public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+	    {
+	        LinkDisplayToApi(this, trilist, joinStart, joinMapKey, bridge);
+	    }
 	}
 
-	/// <summary>
-	/// Represents a BasicIrDisplayFactory
-	/// </summary>
-	public class BasicIrDisplayFactory : EssentialsDeviceFactory<BasicIrDisplay>
-	{
-		/// <summary>
-		/// Initializes a new instance of the BasicIrDisplayFactory class
-		/// </summary>
-		public BasicIrDisplayFactory()
-		{
-			TypeNames = new List<string>() { "basicirdisplay" };
-		}
+    /// <summary>
+    /// Represents a BasicIrDisplayFactory
+    /// </summary>
+    public class BasicIrDisplayFactory : EssentialsDeviceFactory<BasicIrDisplay>
+    {
+        public BasicIrDisplayFactory()
+        {
+            TypeNames = new List<string>() { "basicirdisplay" };
+        }
 
-		/// <summary>
-		/// BuildDevice method
-		/// </summary>
-		/// <inheritdoc />
-		public override EssentialsDevice BuildDevice(DeviceConfig dc)
-		{
-			Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new BasicIrDisplay Device");
-			var ir = IRPortHelper.GetIrPort(dc.Properties);
-			if (ir != null)
-			{
-				var display = new BasicIrDisplay(dc.Key, dc.Name, ir.Port, ir.FileName);
-				display.IrPulseTime = 200;       // Set default pulse time for IR commands.
-				return display;
-			}
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
+        /// <inheritdoc />
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new BasicIrDisplay Device");
+            var ir = IRPortHelper.GetIrPort(dc.Properties);
+            if (ir != null)
+            {
+                var display = new BasicIrDisplay(dc.Key, dc.Name, ir.Port, ir.FileName);
+                display.IrPulseTime = 200;       // Set default pulse time for IR commands.
+                return display;
+            }
 
-			return null;
-		}
-	}
+            return null;
+        }
+    }
 
 }

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

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 	/// Abstract base class for display devices that provides common display functionality
 	/// including power control, input switching, and routing capabilities.
 	/// </summary>
-	public abstract class DisplayBase : EssentialsDevice, IDisplay, ICurrentSources, IHasFeedback
+	public abstract class DisplayBase : EssentialsDevice, IDisplay, ICurrentSources
 	{
 		private RoutingInputPort _currentInputPort;
 
@@ -73,11 +73,13 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
 				var handler = CurrentSourceChange;
 
-				handler?.Invoke(_CurrentSourceInfo, ChangeType.WillChange);
+				if (handler != null)
+					handler(_CurrentSourceInfo, ChangeType.WillChange);
 
 				_CurrentSourceInfo = value;
 
-				handler?.Invoke(_CurrentSourceInfo, ChangeType.DidChange);
+				if (handler != null)
+					handler(_CurrentSourceInfo, ChangeType.DidChange);
 			}
 		}
 		SourceListItem _CurrentSourceInfo;
@@ -158,9 +160,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 			IsCoolingDownFeedback = new BoolFeedback("IsCoolingDown", IsCoolingDownFeedbackFunc);
 			IsWarmingUpFeedback = new BoolFeedback("IsWarmingUp", IsWarmingUpFeedbackFunc);
 
-			Feedbacks.Add(IsCoolingDownFeedback);
-			Feedbacks.Add(IsWarmingUpFeedback);
-
 			InputPorts = new RoutingPortCollection<RoutingInputPort>();
 
 			CurrentSources = new Dictionary<eRoutingSignalType, SourceListItem>
@@ -195,8 +194,17 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		/// Gets the collection of feedback objects for this display device.
 		/// </summary>
 		/// <inheritdoc />
-		public virtual FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
-
+		public virtual FeedbackCollection<Feedback> Feedbacks
+		{
+			get
+			{
+				return new FeedbackCollection<Feedback>
+				{
+					IsCoolingDownFeedback,
+					IsWarmingUpFeedback
+				};
+			}
+		}
 
 		/// <summary>
 		/// Executes a switch to the specified input on the display device. Must be implemented by derived classes.
@@ -244,35 +252,47 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		/// <param name="joinMap">The join map configuration for the device.</param>
 		protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, DisplayControllerJoinMap joinMap)
 		{
-			this.LogDebug("Linking to Trilist {ipId}", trilist.ID.ToString("X"));
-			this.LogDebug("Linking to Display: {displayName}", displayDevice.Name);
+			Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+			Debug.LogMessage(LogEventLevel.Information, "Linking to Display: {0}", displayDevice.Name);
 
 			trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
 
-			if (displayDevice is ICommunicationMonitor commMonitor)
+			var commMonitor = displayDevice as ICommunicationMonitor;
+			if (commMonitor != null)
 			{
 				commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
 			}
 
-			// TODO: revisit this as there could be issues with this approach
 			var inputNumber = 0;
 			var inputKeys = new List<string>();
 
-			var inputNumberFeedback = new IntFeedback("inputNumber", () => inputNumber);
+			var inputNumberFeedback = new IntFeedback(() => inputNumber);
 
-			// Add input number feedback to the device feedback collection to keep it around...
-			Feedbacks.Add(inputNumberFeedback);
+			// Two way feedbacks
+			var twoWayDisplay = displayDevice as TwoWayDisplayBase;
 
-			// Two way feedbacks			
-			if (displayDevice is TwoWayDisplayBase twoWayDisplay)
+			if (twoWayDisplay != null)
 			{
 				trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
 
-				twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => this.LogDebug("CurrentInputFeedback_OutputChange {input}", a.StringValue);
+				twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Information, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
+
 
 				inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
+			}
 
-				twoWayDisplay.PowerIsOnFeedback.OutputChange += (o, a) =>
+			// Power Off
+			trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
+			{
+				inputNumber = 102;
+				inputNumberFeedback.FireUpdate();
+				displayDevice.PowerOff();
+			});
+
+			var twoWayDisplayDevice = displayDevice as TwoWayDisplayBase;
+			if (twoWayDisplayDevice != null)
+			{
+				twoWayDisplayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
 				{
 					if (!a.BoolValue)
 					{
@@ -287,18 +307,10 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 					}
 				};
 
-				twoWayDisplay.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
-				twoWayDisplay.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
+				twoWayDisplayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
+				twoWayDisplayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
 			}
 
-			// Power Off
-			trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
-			{
-				inputNumber = 102;
-				inputNumberFeedback.FireUpdate();
-				displayDevice.PowerOff();
-			});
-
 			// PowerOn
 			trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
 			{
@@ -308,61 +320,44 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 			});
 
 
+
 			for (int i = 0; i < displayDevice.InputPorts.Count; i++)
 			{
-				var localindex = i;
-				if (localindex >= joinMap.InputNamesOffset.JoinSpan)
+				if (i < joinMap.InputNamesOffset.JoinSpan)
 				{
-					this.LogWarning("Device has {inputCount} inputs.  The Join Map allows up to {joinSpan} inputs.  Discarding inputs {discardStart} - {discardEnd} from bridge.",
-						displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, localindex + 1, displayDevice.InputPorts.Count);
-
-					continue;
+					inputKeys.Add(displayDevice.InputPorts[i].Key);
+					var tempKey = inputKeys.ElementAt(i);
+					trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
+						() => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
+					Debug.LogMessage(LogEventLevel.Verbose, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
+						joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
+					trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
 				}
 				else
-				{
-					inputKeys.Add(displayDevice.InputPorts[localindex].Key);
-
-					var tempKey = inputKeys.ElementAt(localindex);
-
-					trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + localindex), () => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
-
-					this.LogDebug("Setting Input Select Action on Digital Join {joinNumber} to Input: {input}", joinMap.InputSelectOffset.JoinNumber + localindex, displayDevice.InputPorts[tempKey].Key);
-
-					trilist.SetString((uint)(joinMap.InputNamesOffset.JoinNumber + localindex), displayDevice.InputPorts[localindex].Key);
-				}
+					Debug.LogMessage(LogEventLevel.Information, displayDevice, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
+						displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
 			}
 
-			this.LogDebug("Setting Input Select Action on Analog Join {inputSelectJoin}", joinMap.InputSelect);
-
-			trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (requestedInput) =>
+			Debug.LogMessage(LogEventLevel.Verbose, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
+			trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
 			{
-				if (requestedInput == 0)
+				if (a == 0)
 				{
 					displayDevice.PowerOff();
 					inputNumber = 0;
-					return;
 				}
-
-				// using 1-based indexing for inputs coming from SIMPL, so need to check if the input is <= the count, not <
-				if (requestedInput > 0 && requestedInput <= displayDevice.InputPorts.Count && requestedInput != inputNumber)
+				else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
 				{
-					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(requestedInput - 1).Selector);
-
-					inputNumber = requestedInput;
-
-					return;
+					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
+					inputNumber = a;
 				}
-
-				if (requestedInput == 102)
+				else if (a == 102)
 				{
 					displayDevice.PowerToggle();
-					return;
-				}
 
-				if (displayDevice is TwoWayDisplayBase)
-				{
-					inputNumberFeedback?.FireUpdate();
 				}
+				if (twoWayDisplay != null)
+					inputNumberFeedback.FireUpdate();
 			});
 
 
@@ -435,4 +430,95 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 		}
 
 	}
+
+	/// <summary>
+	/// Abstract base class for two-way display devices that provide feedback capabilities.
+	/// Extends DisplayBase with routing feedback and power control feedback functionality.
+	/// </summary>
+	public abstract class TwoWayDisplayBase : DisplayBase, IRoutingFeedback, IHasPowerControlWithFeedback
+	{
+		/// <summary>
+		/// Gets feedback for the current input selection on the display.
+		/// </summary>
+		public StringFeedback CurrentInputFeedback { get; private set; }
+
+		/// <summary>
+		/// Abstract function that must be implemented by derived classes to provide the current input feedback value.
+		/// Must be implemented by concrete sub-classes.
+		/// </summary>
+		abstract protected Func<string> CurrentInputFeedbackFunc { get; }
+
+		/// <summary>
+		/// Gets feedback indicating whether the display is currently powered on.
+		/// </summary>
+		public BoolFeedback PowerIsOnFeedback { get; protected set; }
+
+		/// <summary>
+		/// Abstract function that must be implemented by derived classes to provide the power state feedback value.
+		/// Must be implemented by concrete sub-classes.
+		/// </summary>
+		abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
+
+		/// <summary>
+		/// Gets the default mock display instance for testing and development purposes.
+		/// </summary>
+		public static MockDisplay DefaultDisplay
+		{
+			get
+			{
+				if (_DefaultDisplay == null)
+					_DefaultDisplay = new MockDisplay("default", "Default Display");
+				return _DefaultDisplay;
+			}
+		}
+		static MockDisplay _DefaultDisplay;
+
+		/// <summary>
+		/// Initializes a new instance of the TwoWayDisplayBase class.
+		/// </summary>
+		/// <param name="key">The unique key identifier for this display device.</param>
+		/// <param name="name">The friendly name for this display device.</param>
+		public TwoWayDisplayBase(string key, string name)
+			: base(key, name)
+		{
+			CurrentInputFeedback = new StringFeedback(CurrentInputFeedbackFunc);
+
+			WarmupTime = 7000;
+			CooldownTime = 15000;
+
+			PowerIsOnFeedback = new BoolFeedback("PowerOnFeedback", PowerIsOnFeedbackFunc);
+
+			Feedbacks.Add(CurrentInputFeedback);
+			Feedbacks.Add(PowerIsOnFeedback);
+
+			PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
+
+		}
+
+		void PowerIsOnFeedback_OutputChange(object sender, EventArgs e)
+		{
+			if (UsageTracker != null)
+			{
+				if (PowerIsOnFeedback.BoolValue)
+					UsageTracker.StartDeviceUsage();
+				else
+					UsageTracker.EndDeviceUsage();
+			}
+		}
+
+		/// <summary>
+		/// Event that is raised when a numeric switch change occurs on the display.
+		/// </summary>
+		public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
+
+		/// <summary>
+		/// Raise an event when the status of a switch object changes.
+		/// </summary>
+		/// <param name="e">Arguments defined as IKeyName sender, output, input, and eRoutingSignalType</param>
+		protected void OnSwitchChange(RoutingNumericEventArgs e)
+		{
+			var newEvent = NumericSwitchChange;
+			if (newEvent != null) newEvent(this, e);
+		}
+	}
 }

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

@@ -1,89 +1,38 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Devices.Displays
 {
     /// <summary>
     /// Defines the contract for IInputHdmi1
     /// </summary>
-    [Obsolete()]
-    public interface IInputHdmi1
-    {
-        /// <summary>
-        /// Switches to HDMI 1 input
-        /// </summary>
-        void InputHdmi1();
-    }
-
+    public interface IInputHdmi1 { void InputHdmi1(); }
     /// <summary>
     /// Defines the contract for IInputHdmi2
     /// </summary>
-    [Obsolete()]
-    public interface IInputHdmi2
-    {
-        /// <summary>
-        /// Switches to HDMI 2 input
-        /// </summary>
-        void InputHdmi2();
-    }
-
+    public interface IInputHdmi2 { void InputHdmi2(); }
     /// <summary>
     /// Defines the contract for IInputHdmi3
     /// </summary>
-    [Obsolete()]
-    public interface IInputHdmi3
-    {
-        /// <summary>
-        /// Switches to HDMI 3 input
-        /// </summary>
-        void InputHdmi3();
-    }
-
+    public interface IInputHdmi3 { void InputHdmi3(); }
     /// <summary>
     /// Defines the contract for IInputHdmi4
     /// </summary>
-    [Obsolete()]
-    public interface IInputHdmi4
-    {
-        /// <summary>
-        /// Switches to HDMI 4 input
-        /// </summary>
-        void InputHdmi4();
-    }
-
+    public interface IInputHdmi4 { void InputHdmi4(); }
     /// <summary>
     /// Defines the contract for IInputDisplayPort1
     /// </summary>
-    [Obsolete()]
-    public interface IInputDisplayPort1
-    {
-        /// <summary>
-        /// Switches to DisplayPort 1 input
-        /// </summary>
-        void InputDisplayPort1();
-    }
-
+    public interface IInputDisplayPort1 { void InputDisplayPort1(); }
     /// <summary>
     /// Defines the contract for IInputDisplayPort2
     /// </summary>
-    [Obsolete()]
-    public interface IInputDisplayPort2
-    {
-        /// <summary>
-        /// Switches to DisplayPort 2 input
-        /// </summary>
-        void InputDisplayPort2();
-    }
-
+    public interface IInputDisplayPort2 { void InputDisplayPort2(); }
     /// <summary>
     /// Defines the contract for IInputVga1
     /// </summary>
-    [Obsolete()]
-    public interface IInputVga1
-    {
-        /// <summary>
-        /// Switches to VGA 1 input
-        /// </summary>
-        void InputVga1();
-    }
+    public interface IInputVga1 { void InputVga1(); }
 
 }

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

@@ -16,19 +16,16 @@ namespace PepperDash.Essentials.Devices.Common.Displays
     /// Represents a MockDisplay
     /// </summary>
     public class MockDisplay : TwoWayDisplayBase, IBasicVolumeWithFeedback, IBridgeAdvanced, IHasInputs<string>, IRoutingSinkWithSwitchingWithInputPort, IHasPowerControlWithFeedback
-    {
+	{
         /// <summary>
         /// Gets or sets the Inputs
         /// </summary>
         public ISelectableItems<string> Inputs { get; private set; }
 
-        bool _PowerIsOn;
-        bool _IsWarmingUp;
-        bool _IsCoolingDown;
+		bool _PowerIsOn;
+		bool _IsWarmingUp;
+		bool _IsCoolingDown;
 
-        /// <summary>
-        /// Gets the power is on feedback function
-        /// </summary>
         protected override Func<bool> PowerIsOnFeedbackFunc
         {
             get
@@ -37,12 +34,8 @@ namespace PepperDash.Essentials.Devices.Common.Displays
                     {
                         return _PowerIsOn;
                     };
-            }
-        }
-        /// <summary>
-        /// Gets the is cooling down feedback function
-        /// </summary>
-        protected override Func<bool> IsCoolingDownFeedbackFunc
+        } }
+		protected override Func<bool> IsCoolingDownFeedbackFunc
         {
             get
             {
@@ -52,10 +45,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
                 };
             }
         }
-        /// <summary>
-        /// Gets the is warming up feedback function
-        /// </summary>
-        protected override Func<bool> IsWarmingUpFeedbackFunc
+		protected override Func<bool> IsWarmingUpFeedbackFunc
         {
             get
             {
@@ -65,128 +55,120 @@ namespace PepperDash.Essentials.Devices.Common.Displays
                 };
             }
         }
-        /// <summary>
-        /// Gets the current input feedback function
-        /// </summary>
         protected override Func<string> CurrentInputFeedbackFunc { get { return () => Inputs.CurrentItem; } }
 
         int VolumeHeldRepeatInterval = 200;
         ushort VolumeInterval = 655;
-        ushort _FakeVolumeLevel = 31768;
-        bool _IsMuted;
+		ushort _FakeVolumeLevel = 31768;
+		bool _IsMuted;
 
-        /// <summary>
-        /// Initializes a new instance of the MockDisplay class
-        /// </summary>
-        /// <param name="key">The device key</param>
-        /// <param name="name">The device name</param>
-        public MockDisplay(string key, string name)
-            : base(key, name)
-        {
+		public MockDisplay(string key, string name)
+			: base(key, name)
+		{
             Inputs = new MockDisplayInputs
             {
                 Items = new Dictionary<string, ISelectableItem>
-                {
-                    { "HDMI1", new MockDisplayInput ( "HDMI1", "HDMI 1",this ) },
-                    { "HDMI2", new MockDisplayInput ("HDMI2", "HDMI 2",this ) },
-                    { "HDMI3", new MockDisplayInput ("HDMI3", "HDMI 3",this ) },
-                    { "HDMI4", new MockDisplayInput ("HDMI4", "HDMI 4",this )},
-                    { "DP", new MockDisplayInput ("DP", "DisplayPort", this ) }
-                }
+				{
+					{ "HDMI1", new MockDisplayInput ( "HDMI1", "HDMI 1",this ) },
+					{ "HDMI2", new MockDisplayInput ("HDMI2", "HDMI 2",this ) },
+					{ "HDMI3", new MockDisplayInput ("HDMI3", "HDMI 3",this ) },
+					{ "HDMI4", new MockDisplayInput ("HDMI4", "HDMI 4",this )},
+					{ "DP", new MockDisplayInput ("DP", "DisplayPort", this ) }
+				}
             };
 
-            Inputs.CurrentItemChanged += (o, a) => CurrentInputFeedback.FireUpdate();
-
+			Inputs.CurrentItemChanged += (o, a) => CurrentInputFeedback.FireUpdate();
+           
             var hdmiIn1 = new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, "HDMI1", this);
-            var hdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, "HDMI2", this);
-            var hdmiIn3 = new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, "HDMI3", this);
-            var hdmiIn4 = new RoutingInputPort(RoutingPortNames.HdmiIn4, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, "HDMI4", this);
-            var dpIn = new RoutingInputPort(RoutingPortNames.DisplayPortIn, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.DisplayPort, "DP", this);
-            InputPorts.AddRange(new[] { hdmiIn1, hdmiIn2, hdmiIn3, hdmiIn4, dpIn });
+				eRoutingPortConnectionType.Hdmi, "HDMI1", this);
+			var hdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo,
+				eRoutingPortConnectionType.Hdmi, "HDMI2", this);
+			var hdmiIn3 = new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.AudioVideo,
+				eRoutingPortConnectionType.Hdmi, "HDMI3", this);
+			var hdmiIn4 = new RoutingInputPort(RoutingPortNames.HdmiIn4, eRoutingSignalType.AudioVideo,
+				eRoutingPortConnectionType.Hdmi, "HDMI4", this);
+			var dpIn = new RoutingInputPort(RoutingPortNames.DisplayPortIn, eRoutingSignalType.AudioVideo,
+				eRoutingPortConnectionType.DisplayPort, "DP", this);
+			InputPorts.AddRange(new[] { hdmiIn1, hdmiIn2, hdmiIn3, hdmiIn4, dpIn });
 
-            VolumeLevelFeedback = new IntFeedback("volume", () => { return _FakeVolumeLevel; });
-            MuteFeedback = new BoolFeedback("muteOn", () => _IsMuted);
+			VolumeLevelFeedback = new IntFeedback(() => { return _FakeVolumeLevel; });
+			MuteFeedback = new BoolFeedback("MuteOn", () => _IsMuted);
 
             WarmupTime = 10000;
             CooldownTime = 10000;
-        }
+		}
 
-        /// <summary>
-        /// PowerOn method
-        /// </summary>
-        /// <inheritdoc />
-        public override void PowerOn()
-        {
-            if (!PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-            {
-                _IsWarmingUp = true;
-                IsWarmingUpFeedback.InvokeFireUpdate();
-                // Fake power-up cycle
-                WarmupTimer = new CTimer(o =>
-                    {
-                        _IsWarmingUp = false;
-                        _PowerIsOn = true;
-                        IsWarmingUpFeedback.InvokeFireUpdate();
-                        PowerIsOnFeedback.InvokeFireUpdate();
-                    }, WarmupTime);
-            }
-        }
+  /// <summary>
+  /// PowerOn method
+  /// </summary>
+  /// <inheritdoc />
+		public override void PowerOn()
+		{
+			if (!PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
+			{
+				_IsWarmingUp = true;
+				IsWarmingUpFeedback.InvokeFireUpdate();
+				// Fake power-up cycle
+				WarmupTimer = new CTimer(o =>
+					{
+						_IsWarmingUp = false;
+						_PowerIsOn = true;
+						IsWarmingUpFeedback.InvokeFireUpdate();
+						PowerIsOnFeedback.InvokeFireUpdate();
+					}, WarmupTime);
+			}
+		}
 
-        /// <summary>
-        /// PowerOff method
-        /// </summary>
-        /// <inheritdoc />
-        public override void PowerOff()
-        {
-            // If a display has unreliable-power off feedback, just override this and
-            // remove this check.
-            if (PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-            {
-                _IsCoolingDown = true;
-                IsCoolingDownFeedback.InvokeFireUpdate();
-                // Fake cool-down cycle
-                CooldownTimer = new CTimer(o =>
-                    {
-                        Debug.LogMessage(LogEventLevel.Verbose, "Cooldown timer ending", this);
-                        _IsCoolingDown = false;
-                        IsCoolingDownFeedback.InvokeFireUpdate();
+  /// <summary>
+  /// PowerOff method
+  /// </summary>
+  /// <inheritdoc />
+		public override void PowerOff()
+		{
+			// If a display has unreliable-power off feedback, just override this and
+			// remove this check.
+			if (PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
+			{
+				_IsCoolingDown = true;
+				IsCoolingDownFeedback.InvokeFireUpdate();
+				// Fake cool-down cycle
+				CooldownTimer = new CTimer(o =>
+					{
+						Debug.LogMessage(LogEventLevel.Verbose, "Cooldown timer ending", this);
+						_IsCoolingDown = false;
+						IsCoolingDownFeedback.InvokeFireUpdate();
                         _PowerIsOn = false;
                         PowerIsOnFeedback.InvokeFireUpdate();
-                    }, CooldownTime);
-            }
-        }
+					}, CooldownTime);
+			}
+		}		
+		
+  /// <summary>
+  /// PowerToggle method
+  /// </summary>
+  /// <inheritdoc />
+		public override void PowerToggle()
+		{
+			if (PowerIsOnFeedback.BoolValue && !IsWarmingUpFeedback.BoolValue)
+				PowerOff();
+			else if (!PowerIsOnFeedback.BoolValue && !IsCoolingDownFeedback.BoolValue)
+				PowerOn();
+		}
 
-        /// <summary>
-        /// PowerToggle method
-        /// </summary>
-        /// <inheritdoc />
-        public override void PowerToggle()
-        {
-            if (PowerIsOnFeedback.BoolValue && !IsWarmingUpFeedback.BoolValue)
-                PowerOff();
-            else if (!PowerIsOnFeedback.BoolValue && !IsCoolingDownFeedback.BoolValue)
-                PowerOn();
-        }
-
-        /// <summary>
-        /// ExecuteSwitch method
-        /// </summary>
-        /// <inheritdoc />
-        public override void ExecuteSwitch(object selector)
-        {
+  /// <summary>
+  /// ExecuteSwitch method
+  /// </summary>
+  /// <inheritdoc />
+		public override void ExecuteSwitch(object selector)
+		{
             try
             {
                 Debug.LogMessage(LogEventLevel.Verbose, "ExecuteSwitch: {0}", this, selector);
 
-                if (!_PowerIsOn)
-                {
-                    PowerOn();
-                }
+			if (!_PowerIsOn)
+			{
+				PowerOn();
+			}
 
                 if (!Inputs.Items.TryGetValue(selector.ToString(), out var input))
                     return;
@@ -202,14 +184,13 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
                 if (inputPort == null)
                 {
-                    Debug.LogMessage(LogEventLevel.Verbose, "Unable to find input port for selector {selector}", this, selector);
+                    Debug.LogMessage(LogEventLevel.Verbose, "Unable to find input port for selector {selector}", this, selector);                    
                     return;
                 }
 
                 Debug.LogMessage(LogEventLevel.Verbose, "Setting current input port to {inputPort}", this, inputPort);
                 CurrentInputPort = inputPort;
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 Debug.LogMessage(ex, "Error making switch: {Exception}", this, ex);
             }
@@ -220,14 +201,14 @@ namespace PepperDash.Essentials.Devices.Common.Displays
         /// </summary>
         public void SetInput(string selector)
         {
-            ISelectableItem currentInput = null;
-
-            try
-            {
-                currentInput = Inputs.Items.SingleOrDefault(Inputs => Inputs.Value.IsSelected).Value;
-            }
-            catch { }
+			ISelectableItem currentInput = null;
 
+			try
+			{
+				currentInput = Inputs.Items.SingleOrDefault(Inputs => Inputs.Value.IsSelected).Value;
+			}
+			catch { }
+			
 
             if (currentInput != null)
             {
@@ -235,12 +216,12 @@ namespace PepperDash.Essentials.Devices.Common.Displays
                 currentInput.IsSelected = false;
             }
 
-            if (!Inputs.Items.TryGetValue(selector, out var input))
+			if (!Inputs.Items.TryGetValue(selector, out var input))
                 return;
 
-            input.IsSelected = true;
+			input.IsSelected = true;
 
-            Inputs.CurrentItem = selector;
+			Inputs.CurrentItem = selector;
         }
 
 
@@ -251,37 +232,37 @@ namespace PepperDash.Essentials.Devices.Common.Displays
         /// </summary>
         public IntFeedback VolumeLevelFeedback { get; private set; }
 
-        /// <summary>
-        /// SetVolume method
-        /// </summary>
-        public void SetVolume(ushort level)
-        {
-            _FakeVolumeLevel = level;
-            VolumeLevelFeedback.InvokeFireUpdate();
-        }
+  /// <summary>
+  /// SetVolume method
+  /// </summary>
+		public void SetVolume(ushort level)
+		{
+			_FakeVolumeLevel = level;
+			VolumeLevelFeedback.InvokeFireUpdate();
+		}
 
-        /// <summary>
-        /// MuteOn method
-        /// </summary>
-        public void MuteOn()
-        {
-            _IsMuted = true;
-            MuteFeedback.InvokeFireUpdate();
-        }
+  /// <summary>
+  /// MuteOn method
+  /// </summary>
+		public void MuteOn()
+		{
+			_IsMuted = true;
+			MuteFeedback.InvokeFireUpdate();
+		}
 
-        /// <summary>
-        /// MuteOff method
-        /// </summary>
-        public void MuteOff()
-        {
-            _IsMuted = false;
-            MuteFeedback.InvokeFireUpdate();
-        }
+  /// <summary>
+  /// MuteOff method
+  /// </summary>
+		public void MuteOff()
+		{
+			_IsMuted = false;
+			MuteFeedback.InvokeFireUpdate();
+		}
 
-        /// <summary>
-        /// Gets or sets the MuteFeedback
-        /// </summary>
-        public BoolFeedback MuteFeedback { get; private set; }
+  /// <summary>
+  /// Gets or sets the MuteFeedback
+  /// </summary>
+		public BoolFeedback MuteFeedback { get; private set; }
 
 
         #endregion
@@ -292,77 +273,74 @@ namespace PepperDash.Essentials.Devices.Common.Displays
         /// VolumeUp method
         /// </summary>
         public void VolumeUp(bool pressRelease)
-        {
+		{
             //while (pressRelease)
             //{
-            Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Down {0}", pressRelease);
-            if (pressRelease)
-            {
-                var newLevel = _FakeVolumeLevel + VolumeInterval;
-                SetVolume((ushort)newLevel);
-                CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
-            }
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Down {0}", pressRelease);
+                if (pressRelease)
+                {
+                    var newLevel = _FakeVolumeLevel + VolumeInterval;
+                    SetVolume((ushort)newLevel);
+                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
+                }
             //}
-        }
+		}
 
-        /// <summary>
-        /// VolumeDown method
-        /// </summary>
-        public void VolumeDown(bool pressRelease)
-        {
+  /// <summary>
+  /// VolumeDown method
+  /// </summary>
+		public void VolumeDown(bool pressRelease)
+		{
             //while (pressRelease)
             //{
-            Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Up {0}", pressRelease);
-            if (pressRelease)
-            {
-                var newLevel = _FakeVolumeLevel - VolumeInterval;
-                SetVolume((ushort)newLevel);
-                CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
-            }
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Up {0}", pressRelease);
+                if (pressRelease)
+                {
+                    var newLevel = _FakeVolumeLevel - VolumeInterval;
+                    SetVolume((ushort)newLevel);
+                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
+                }
             //}
-        }
+		}
 
-        /// <summary>
-        /// MuteToggle method
-        /// </summary>
-        public void MuteToggle()
-        {
-            _IsMuted = !_IsMuted;
-            MuteFeedback.InvokeFireUpdate();
-        }
+  /// <summary>
+  /// MuteToggle method
+  /// </summary>
+		public void MuteToggle()
+		{
+			_IsMuted = !_IsMuted;
+			MuteFeedback.InvokeFireUpdate();
+		}
 
-        #endregion
+		#endregion
 
-        /// <summary>
-        /// LinkToApi method
-        /// </summary>
-        public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            LinkDisplayToApi(this, trilist, joinStart, joinMapKey, bridge);
-        }
+     /// <summary>
+     /// LinkToApi method
+     /// </summary>
+	    public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+	    {
+	        LinkDisplayToApi(this, trilist, joinStart, joinMapKey, bridge);
+	    }
     }
 
-    /// <summary>
-    /// Represents a MockDisplayFactory
-    /// </summary>
-    public class MockDisplayFactory : EssentialsDeviceFactory<MockDisplay>
-    {
-        /// <summary>
-        /// Initializes a new instance of the MockDisplayFactory class
-        /// </summary>
-        public MockDisplayFactory()
-        {
-            TypeNames = new List<string>() { "mockdisplay", "mockdisplay2" };
-        }
+ /// <summary>
+ /// Represents a MockDisplayFactory
+ /// </summary>
+	public class MockDisplayFactory : EssentialsDeviceFactory<MockDisplay>
+	{
+		public MockDisplayFactory()
+		{
+			TypeNames = new List<string>() { "mockdisplay" , "mockdisplay2" };
+		}
 
-        /// <summary>
-        /// BuildDevice method
-        /// </summary>
-        /// <inheritdoc />
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Mock Display Device");
-            return new MockDisplay(dc.Key, dc.Name);
-        }
-    }
+  /// <summary>
+  /// BuildDevice method
+  /// </summary>
+  /// <inheritdoc />
+		public override EssentialsDevice BuildDevice(DeviceConfig dc)
+		{
+			Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Mock Display Device");
+			return new MockDisplay(dc.Key, dc.Name);
+		}
+	}
 }

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

@@ -1,6 +1,10 @@
-using System;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
 using System.Collections.Generic;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Devices.Common.Displays
 {
@@ -11,9 +15,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
     {
         private Dictionary<string, ISelectableItem> _items;
 
-        /// <summary>
-        /// Gets or sets the collection of selectable items
-        /// </summary>
         public Dictionary<string, ISelectableItem> Items
         {
             get
@@ -33,11 +34,8 @@ namespace PepperDash.Essentials.Devices.Common.Displays
 
         private string _currentItem;
 
-        /// <summary>
-        /// Gets or sets the currently selected item
-        /// </summary>
         public string CurrentItem
-        {
+        { 
             get
             {
                 return _currentItem;
@@ -53,13 +51,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
             }
         }
 
-        /// <summary>
-        /// Occurs when the items collection is updated
-        /// </summary>
         public event EventHandler ItemsUpdated;
-        /// <summary>
-        /// Occurs when the current item changes
-        /// </summary>
         public event EventHandler CurrentItemChanged;
     }
 
@@ -71,10 +63,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
         private MockDisplay _parent;
 
         private bool _isSelected;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this input is selected
-        /// </summary>
+        
         public bool IsSelected
         {
             get
@@ -102,17 +91,8 @@ namespace PepperDash.Essentials.Devices.Common.Displays
         /// </summary>
         public string Key { get; set; }
 
-        /// <summary>
-        /// Occurs when this item is updated
-        /// </summary>
         public event EventHandler ItemUpdated;
 
-        /// <summary>
-        /// Initializes a new instance of the MockDisplayInput class
-        /// </summary>
-        /// <param name="key">The input key</param>
-        /// <param name="name">The input name</param>
-        /// <param name="parent">The parent mock display</param>
         public MockDisplayInput(string key, string name, MockDisplay parent)
         {
             Key = key;
@@ -127,7 +107,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
         {
             if (!_parent.PowerIsOnFeedback.BoolValue) _parent.PowerOn();
 
-            foreach (var input in _parent.Inputs.Items)
+            foreach(var input in _parent.Inputs.Items)
             {
                 input.Value.IsSelected = input.Key == this.Key;
             }

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

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.CrestronIO;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Shades
@@ -25,9 +28,6 @@ namespace PepperDash.Essentials.Devices.Common.Shades
         ISwitchedOutput LowerRelay;
         ISwitchedOutput LatchedRelay;
 
-        /// <summary>
-        /// Gets or sets the InUpPosition
-        /// </summary>
         public bool InUpPosition
         {
             get { return _isInUpPosition; }
@@ -41,12 +41,10 @@ namespace PepperDash.Essentials.Devices.Common.Shades
         }
 
         private bool _isInUpPosition { get; set; }
-
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
         public eScreenLiftControlType Type { get; private set; }
-
         /// <summary>
         /// Gets or sets the Mode
         /// </summary>
@@ -56,20 +54,13 @@ namespace PepperDash.Essentials.Devices.Common.Shades
         /// Gets or sets the DisplayDeviceKey
         /// </summary>
         public string DisplayDeviceKey { get; private set; }
-
         /// <summary>
         /// Gets or sets the IsInUpPosition
         /// </summary>
         public BoolFeedback IsInUpPosition { get; private set; }
 
-        /// <summary>
-        /// Event that fires when the position changes
-        /// </summary>
         public event EventHandler<EventArgs> PositionChanged;
 
-        /// <summary>
-        /// Constructor for ScreenLiftController
-        /// </summary>
         public ScreenLiftController(string key, string name, ScreenLiftControllerConfigProperties config)
             : base(key, name)
         {
@@ -78,7 +69,7 @@ namespace PepperDash.Essentials.Devices.Common.Shades
             Mode = Config.Mode;
             Type = Config.Type;
 
-            IsInUpPosition = new BoolFeedback("isInUpPosition", () => _isInUpPosition);
+            IsInUpPosition = new BoolFeedback(() => _isInUpPosition);
 
             switch (Mode)
             {
@@ -215,14 +206,14 @@ namespace PepperDash.Essentials.Devices.Common.Shades
         /// <summary>
         /// Attempts to get the port on teh specified device from config
         /// </summary>
-        /// <param name="relayKey"></param>
+        /// <param name="relayConfig"></param>
         /// <returns></returns>
         ISwitchedOutput GetSwitchedOutputFromDevice(string relayKey)
         {
             var portDevice = DeviceManager.GetDeviceForKey(relayKey);
             if (portDevice != null)
             {
-                return portDevice as ISwitchedOutput;
+                return (portDevice as ISwitchedOutput);
             }
             else
             {
@@ -247,14 +238,58 @@ namespace PepperDash.Essentials.Devices.Common.Shades
 
     }
 
+    /// <summary>
+    /// Represents a ScreenLiftControllerConfigProperties
+    /// </summary>
+    public class ScreenLiftControllerConfigProperties
+    {
+        [JsonProperty("displayDeviceKey")]
+        /// <summary>
+        /// Gets or sets the DisplayDeviceKey
+        /// </summary>
+        public string DisplayDeviceKey { get; set; }
+
+        [JsonProperty("type")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        /// <summary>
+        /// Gets or sets the Type
+        /// </summary>
+        public eScreenLiftControlType Type { get; set; }
+
+        [JsonProperty("mode")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        /// <summary>
+        /// Gets or sets the Mode
+        /// </summary>
+        public eScreenLiftControlMode Mode { get; set; }
+
+        [JsonProperty("relays")]
+        public Dictionary<string,ScreenLiftRelaysConfig> Relays { get; set; }
+
+    }
+    /// <summary>
+    /// Represents a ScreenLiftRelaysConfig
+    /// </summary>
+    public class ScreenLiftRelaysConfig
+    {
+        [JsonProperty("deviceKey")]
+        /// <summary>
+        /// Gets or sets the DeviceKey
+        /// </summary>
+        public string DeviceKey { get; set; }
+
+        [JsonProperty("pulseTimeInMs")]
+        /// <summary>
+        /// Gets or sets the PulseTimeInMs
+        /// </summary>
+        public int PulseTimeInMs { get; set; }
+    }
+
     /// <summary>
     /// Represents a ScreenLiftControllerFactory
     /// </summary>
     public class ScreenLiftControllerFactory : EssentialsDeviceFactory<RelayControlledShade>
     {
-        /// <summary> 
-        /// Constructor for ScreenLiftControllerFactory
-        /// </summary>
         public ScreenLiftControllerFactory()
         {
             TypeNames = new List<string>() { "screenliftcontroller" };
@@ -272,4 +307,13 @@ namespace PepperDash.Essentials.Devices.Common.Shades
             return new ScreenLiftController(dc.Key, dc.Name, props);
         }
     }
+
+    /// <summary>
+    /// Enumeration of eScreenLiftControlMode values
+    /// </summary>
+    public enum eScreenLiftControlMode
+    {
+        momentary,
+        latched
+    }
 }

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

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-
-namespace PepperDash.Essentials.Devices.Common.Shades
-{
-  /// <summary>
-  /// Represents a ScreenLiftControllerConfigProperties
-  /// </summary>
-  public class ScreenLiftControllerConfigProperties
-  {
-
-    /// <summary>
-    /// Gets or sets the DisplayDeviceKey
-    /// </summary>
-    [JsonProperty("displayDeviceKey")]
-    public string DisplayDeviceKey { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Type
-    /// </summary>
-    [JsonProperty("type")]
-    [JsonConverter(typeof(StringEnumConverter))]
-    public eScreenLiftControlType Type { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Mode
-    /// </summary>
-    [JsonProperty("mode")]
-    [JsonConverter(typeof(StringEnumConverter))]
-    public eScreenLiftControlMode Mode { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Relays
-    /// </summary>
-    [JsonProperty("relays")]
-    public Dictionary<string, ScreenLiftRelaysConfig> Relays { get; set; }
-
-  }
-}

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

@@ -1,22 +0,0 @@
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Devices.Common.Shades
-{
-  /// <summary>
-  /// Represents a ScreenLiftRelaysConfig
-  /// </summary>
-  public class ScreenLiftRelaysConfig
-  {
-    /// <summary>
-    /// Gets or sets the DeviceKey
-    /// </summary>
-    [JsonProperty("deviceKey")]
-    public string DeviceKey { get; set; }
-
-    /// <summary>
-    /// Gets or sets the PulseTimeInMs
-    /// </summary>
-    [JsonProperty("pulseTimeInMs")]
-    public int PulseTimeInMs { get; set; }
-  }
-}