Merged in maintenance/PR-5 (pull request #41)

Update PD.Core version

.gitignore

@@ -20,4 +20,5 @@ obj/
 [Rr]elease*/
 _ReSharper*/
 SIMPLSharpLogs/
-*.projectinfo
+*.projectinfo
+essentials-framework/EssentialDMTestConfig/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "essentials-framework"]
-	path = essentials-framework
-	url = https://bitbucket.org/Pepperdash_Products/essentials-framework.git
+[submodule "essentials-framework/pepperdashcore-builds"]
+	path = essentials-framework/pepperdashcore-builds
+	url = https://bitbucket.org/Pepperdash_Products/pepperdashcore-builds.git

PepperDashEssentials.sln

@@ -1,49 +1,49 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", ".\PepperDashEssentials\PepperDashEssentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{892B761C-E479-44CE-BD74-243E9214AF13} = {892B761C-E479-44CE-BD74-243E9214AF13}
-		{9199CE8A-0C9F-4952-8672-3EED798B284F} = {9199CE8A-0C9F-4952-8672-3EED798B284F}
-		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", ".\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", ".\essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials_DM", ".\essentials-framework\Essentials DM\Essentials_DM\Essentials_DM.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{892B761C-E479-44CE-BD74-243E9214AF13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{892B761C-E479-44CE-BD74-243E9214AF13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{892B761C-E479-44CE-BD74-243E9214AF13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{892B761C-E479-44CE-BD74-243E9214AF13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", ".\PepperDashEssentials\PepperDashEssentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{892B761C-E479-44CE-BD74-243E9214AF13} = {892B761C-E479-44CE-BD74-243E9214AF13}
+		{9199CE8A-0C9F-4952-8672-3EED798B284F} = {9199CE8A-0C9F-4952-8672-3EED798B284F}
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", ".\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", ".\essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials_DM", ".\essentials-framework\Essentials DM\Essentials_DM\Essentials_DM.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BED5BA9-88C4-4365-9362-6F4B128071D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{892B761C-E479-44CE-BD74-243E9214AF13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IChannelExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class IChannelExtensions
     {
-        public static void LinkActions(this IChannel dev, CotijaSystemController controller)
+        public static void LinkActions(this IChannel dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.Room.Cotija
             controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit));
         }
 
-        public static void UnlinkActions(this IChannel dev, CotijaSystemController controller)
+        public static void UnlinkActions(this IChannel dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IColorExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class IColorExtensions
     {
-        public static void LinkActions(this IColor dev, CotijaSystemController controller)
+        public static void LinkActions(this IColor dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Room.Cotija
             controller.AddAction(prefix + "blue", new PressAndHoldAction(dev.Blue));
         }
 
-        public static void UnlinkActions(this IColor dev, CotijaSystemController controller)
+        public static void UnlinkActions(this IColor dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDPadExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class IDPadExtensions
     {
-        public static void LinkActions(this IDPad dev, CotijaSystemController controller)
+        public static void LinkActions(this IDPad dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Room.Cotija
             controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit));
         }
 
-        public static void UnlinkActions(this IDPad dev, CotijaSystemController controller)
+        public static void UnlinkActions(this IDPad dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IDvrExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class IDvrExtensions
     {
-        public static void LinkActions(this IDvr dev, CotijaSystemController controller)
+        public static void LinkActions(this IDvr dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Room.Cotija
             controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record));
         }
 
-        public static void UnlinkActions(this IDvr dev, CotijaSystemController controller)
+        public static void UnlinkActions(this IDvr dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/INumericExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class INumericExtensions
     {
-        public static void LinkActions(this INumericKeypad dev, CotijaSystemController controller)
+        public static void LinkActions(this INumericKeypad dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -29,7 +29,7 @@ namespace PepperDash.Essentials.Room.Cotija
             // Deal with the Accessory functions on the numpad later
         }
 
-        public static void UnlinkActions(this INumericKeypad dev, CotijaSystemController controller)
+        public static void UnlinkActions(this INumericKeypad dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/IPowerExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class IPowerExtensions
     {
-        public static void LinkActions(this IPower dev, CotijaSystemController controller)
+        public static void LinkActions(this IPower dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Room.Cotija
             controller.AddAction(prefix + "powerToggle", new Action(dev.PowerToggle));
         }
 
-        public static void UnlinkActions(this IPower dev, CotijaSystemController controller)
+        public static void UnlinkActions(this IPower dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ISetTopBoxControlsExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class ISetTopBoxControlsExtensions
     {
-        public static void LinkActions(this ISetTopBoxControls dev, CotijaSystemController controller)
+        public static void LinkActions(this ISetTopBoxControls dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Room.Cotija
             controller.AddAction(prefix + "replay", new PressAndHoldAction(dev.Replay));
         }
 
-        public static void UnlinkActions(this ISetTopBoxControls dev, CotijaSystemController controller)
+        public static void UnlinkActions(this ISetTopBoxControls dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/DeviceTypeInterfaces/ITransportExtensions.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class ITransportExtensions
     {
-        public static void LinkActions(this ITransport dev, CotijaSystemController controller)
+        public static void LinkActions(this ITransport dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 
@@ -24,7 +24,7 @@ namespace PepperDash.Essentials.Room.Cotija
             controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record));
         }
 
-        public static void UnlinkActions(this ITransport dev, CotijaSystemController controller)
+        public static void UnlinkActions(this ITransport dev, MobileControlSystemController controller)
         {
             var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
 

PepperDashEssentials/AppServer/Interfaces.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
 	/// <summary>
 	/// Represents a room whose configuration is derived from runtime data,
@@ -19,42 +19,3 @@ namespace PepperDash.Essentials.Room.Cotija
 	}
 }
 
-namespace PepperDash.Essentials
-{
-	/// <summary>
-	/// For rooms with a single presentation source, change event
-	/// </summary>
-	public interface IHasCurrentSourceInfoChange
-	{
-		string CurrentSourceInfoKey { get; }
-		SourceListItem CurrentSourceInfo { get; }
-		event SourceInfoChangeHandler CurrentSingleSourceChange;
-	}
-
-
-	/// <summary>
-	/// For rooms with routing
-	/// </summary>
-	public interface IRunRouteAction
-	{
-		void RunRouteAction(string routeKey);
-
-		void RunRouteAction(string routeKey, Action successCallback);
-	}
-
-	/// <summary>
-	/// For rooms that default presentation only routing
-	/// </summary>
-	public interface IRunDefaultPresentRoute
-	{
-		bool RunDefaultPresentRoute();
-	}
-
-	/// <summary>
-	/// For rooms that have default presentation and calling routes
-	/// </summary>
-	public interface IRunDefaultCallRoute : IRunDefaultPresentRoute
-	{
-		bool RunDefaultCallRoute();
-	}
-}

PepperDashEssentials/AppServer/Messengers/AudioCodecBaseMessenger.cs

@@ -39,7 +39,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
         }
 
-        protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
         {
             appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendAtcFullMessageObject));
             appServerController.AddAction(MessagePath + "/dial", new Action<string>(s => Codec.Dial(s)));

PepperDashEssentials/AppServer/Messengers/ConfigMessenger.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+
+    /// <summary>
+    /// Handles interactions with the app server to update the config
+    /// </summary>
+    public class ConfigMessenger : MessengerBase
+    {
+        public ConfigMessenger(string key, string messagePath)
+            : base(key, messagePath)
+        {
+            ConfigUpdater.ConfigStatusChanged -= ConfigUpdater_ConfigStatusChanged;
+            ConfigUpdater.ConfigStatusChanged += new EventHandler<ConfigStatusEventArgs>(ConfigUpdater_ConfigStatusChanged);
+        }
+
+        void ConfigUpdater_ConfigStatusChanged(object sender, ConfigStatusEventArgs e)
+        {
+            PostUpdateStatus(e.UpdateStatus.ToString());
+        }
+
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+        {
+            appServerController.AddAction(MessagePath + "/updateConfig", new Action<string>(s => GetConfigFile(s)));
+        }
+
+        /// <summary>
+        /// Generates or passes the URL to make the request to GET the config from a server
+        /// </summary>
+        /// <param name="url"></param>
+        void GetConfigFile(string url)
+        {
+            try
+            {
+                // Attempt to parse the URL
+                var parser = new Crestron.SimplSharp.Net.Http.UrlParser(url);
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully parsed URL from AppServer message: {0}", parser.Url);
+            }
+            catch (Exception e)
+            {
+                // If unable to parse the URL, generate it from config data
+                Debug.Console(2, "Error parsing URL: {0}", e);
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to parse URL from AppServer message.  Generating URL from config data");
+                url = string.Format("http://{0}/api/system/{1}/config", AppServerController.Config.ServerUrl, AppServerController.SystemUuid);
+            }
+
+            ConfigUpdater.GetConfigFromServer(url);
+        }
+
+        /// <summary>
+        /// Posts a message with the current status of the config update
+        /// </summary>
+        /// <param name="status"></param>
+        void PostUpdateStatus(string status)
+        {
+            PostStatusMessage(new
+            {
+                updateStatus = status
+            });
+        }
+
+    }
+
+
+}

PepperDashEssentials/AppServer/Messengers/Ddvc01AtcMessenger.cs

@@ -19,7 +19,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// <summary>
 		/// 221
 		/// </summary>
-		const uint BDialHangup = 221;
+		const uint BDialHangupOnHook = 221;
+
 		/// <summary>
 		/// 251
 		/// </summary>
@@ -126,7 +127,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// 
 		/// </summary>
 		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
+		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
 		{
             //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));
 
@@ -134,7 +135,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			{
 				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
                 //GetCurrentCallList();
-				SendCallsList();
+				SendFullStatus();
 			});
 
 			EISC.SetStringSigAction(SCurrentCallNumber, s => 
@@ -162,7 +163,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			// Add straight pulse calls
 			Action<string, uint> addAction = (s, u) =>
 				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-            addAction("/endCallById", BDialHangup);
+            addAction("/endCallById", BDialHangupOnHook);
+			addAction("/endAllCalls", BDialHangupOnHook);
             addAction("/acceptById", BIncomingAnswer);
             addAction("/rejectById", BIncomingReject);
 			addAction("/speedDial1", BSpeedDial1);

PepperDashEssentials/AppServer/Messengers/Ddvc01VtcMessenger.cs

@@ -123,6 +123,23 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// </summary>
 		const uint BCameraModeOff = 833;
 
+		/// <summary>
+		/// 841
+		/// </summary>
+		const uint BCameraSelfView = 841;
+
+		/// <summary>
+		/// 842
+		/// </summary>
+		const uint BCameraLayout = 842;
+		/// <summary>
+		/// 843
+		/// </summary>
+		const uint BCameraSupportsAutoMode = 843;
+		/// <summary>
+		/// 844
+		/// </summary>
+		const uint BCameraSupportsOffMode = 844;
 
 
 		/********* Ushorts *********/
@@ -236,7 +253,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// 
 		/// </summary>
 		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
+		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
 		{
 			var asc = appServerController;
 			EISC.SetStringSigAction(SHookState, s => 
@@ -285,6 +302,21 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				PostCallsList();
 			});
 
+			EISC.SetBoolSigAction(BCameraSupportsAutoMode, b =>
+			{
+				PostStatusMessage(new
+				{	
+					cameraSupportsAutoMode = b
+				});
+			});
+			EISC.SetBoolSigAction(BCameraSupportsOffMode, b =>
+			{
+				PostStatusMessage(new
+				{
+					cameraSupportsOffMode = b
+				});
+			});
+
 			// Directory insanity
 			EISC.SetUShortSigAction(UDirectoryRowCount, u =>
 			{
@@ -330,6 +362,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			EISC.SetSigTrueAction(BCameraModeManual, () => PostCameraMode());
 			EISC.SetSigTrueAction(BCameraModeOff, () => PostCameraMode());
 
+			EISC.SetBoolSigAction(BCameraSelfView, b => PostStatusMessage(new 
+				{
+					cameraSelfView = b
+				}));
+
 			EISC.SetUShortSigAction(UCameraNumberSelect, (u) => PostSelectedCamera());
 
 
@@ -347,6 +384,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			Action<string, uint> addAction = (s, u) =>
 				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
 			addAction("/endCallById", BDialHangup);
+			addAction("/endAllCalls", BDialHangup);
             addAction("/acceptById", BIncomingAnswer);
             addAction("/rejectById", BIncomingReject);
 			addAction("/speedDial1", BSpeedDial1);
@@ -356,6 +394,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			addAction("/cameraModeAuto", BCameraModeAuto);
 			addAction("/cameraModeManual", BCameraModeManual);
 			addAction("/cameraModeOff", BCameraModeOff);
+			addAction("/cameraSelfView", BCameraSelfView);
+			addAction("/cameraLayout", BCameraLayout);
 
 			asc.AddAction("/cameraSelect", new Action<string>(SelectCamera));
 
@@ -437,6 +477,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			{
 				calls = GetCurrentCallList(),
 				cameraMode = GetCameraMode(),
+				cameraSelfView = EISC.GetBool(BCameraSelfView),
+				cameraSupportsAutoMode = EISC.GetBool(BCameraSupportsAutoMode),
+				cameraSupportsOffMode = EISC.GetBool(BCameraSupportsOffMode),
 				currentCallString = EISC.GetString(SCurrentCallNumber),
 				currentDialString = EISC.GetString(SCurrentDialString),
 				directoryContactSelected = new
@@ -448,8 +491,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				isInCall = EISC.GetString(SHookState) == "Connected",
 				hasDirectory = true,
 				hasDirectorySearch = false,
-				hasRecents = true,
+				hasRecents = !EISC.BooleanOutput[502].BoolValue,
 				hasCameras = true,
+				showCamerasWhenNotInCall = EISC.BooleanOutput[503].BoolValue,
 				selectedCamera = GetSelectedCamera(),
 			});
 		}

PepperDashEssentials/AppServer/Messengers/MessengerBase.cs

@@ -24,7 +24,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// <summary>
 		/// 
 		/// </summary>
-		public CotijaSystemController AppServerController { get; private set; }
+		public MobileControlSystemController AppServerController { get; private set; }
 
 		public string MessagePath { get; private set; }
 
@@ -47,7 +47,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// Registers this messenger with appserver controller
 		/// </summary>
 		/// <param name="appServerController"></param>
-		public void RegisterWithAppServer(CotijaSystemController appServerController)
+		public void RegisterWithAppServer(MobileControlSystemController appServerController)
 		{
 			if (appServerController == null)
 				throw new ArgumentNullException("appServerController");
@@ -60,7 +60,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// Implemented in extending classes. Wire up API calls and feedback here
 		/// </summary>
 		/// <param name="appServerController"></param>
-		abstract protected void CustomRegisterWithAppServer(CotijaSystemController appServerController);
+		abstract protected void CustomRegisterWithAppServer(MobileControlSystemController appServerController);
 
 		/// <summary>
 		/// Helper for posting status message

PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs

@@ -40,8 +40,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <param name="e"></param>
         void ProgramInfoChanged(object sender, ProgramInfoEventArgs e)
         {
-            Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString());
-            PostStatusMessage(e.ProgramInfo);
+            if (e.ProgramInfo != null)
+            {
+                //Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString());
+                PostStatusMessage(e.ProgramInfo);
+            }
         }
 
         /// <summary>
@@ -83,7 +86,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             });
         }
 
-        protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
         {
             AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatusMessage));
         }

PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs

@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.AppServer.Messengers
@@ -40,6 +41,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			if (dirCodec != null)
 			{
 				dirCodec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dirCodec_DirectoryResultReturned);
+
 			}
 
             var recCodec = codec as IHasCallHistory;
@@ -74,12 +76,73 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// <param name="e"></param>
 		void dirCodec_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-			PostStatusMessage(new
-			{
-				currentDirectory = e.Directory
-			});
+            SendDirectory((Codec as IHasDirectory).CurrentDirectoryResult, e.DirectoryIsOnRoot);
 		}
 
+        /// <summary>
+        /// Posts the current directory
+        /// </summary>
+        void SendDirectory(CodecDirectory directory, bool isRoot)
+        {
+            var dirCodec = Codec as IHasDirectory;
+
+            if (dirCodec != null)
+            {
+                var prefixedDirectoryResults = PrefixDirectoryFolderItems(directory);
+
+                var directoryMessage = new
+                {
+                    currentDirectory = new
+                    {
+                        directoryResults = prefixedDirectoryResults,
+                        isRootDirectory = isRoot
+                    }
+                };
+                PostStatusMessage(directoryMessage);
+            }
+        }
+
+        /// <summary>
+        /// Iterates a directory object and prefixes any folder items with "[+] "
+        /// </summary>
+        /// <param name="directory"></param>
+        /// <returns></returns>
+         List<DirectoryItem> PrefixDirectoryFolderItems (CodecDirectory directory)
+        {
+            var tempDirectoryList = new List<DirectoryItem>();
+
+            if (directory.CurrentDirectoryResults.Count > 0)
+            {
+                foreach (var item in directory.CurrentDirectoryResults)
+                {
+                    if (item is DirectoryFolder)
+                    {
+                        var newFolder = new DirectoryFolder();
+
+                        newFolder = (DirectoryFolder)item.Clone();
+
+                        string prefixName = "[+] " + newFolder.Name;
+
+                        newFolder.Name = prefixName;
+
+                        tempDirectoryList.Add(newFolder);
+                    }
+                    else
+                    {
+                        tempDirectoryList.Add(item);
+                    }
+                }
+            }
+            //else
+            //{
+            //    DirectoryItem noResults = new DirectoryItem() { Name = "No Results Found" };
+
+            //    tempDirectoryList.Add(noResults);
+            //}
+
+            return tempDirectoryList;
+        }
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -97,7 +160,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// Called from base's RegisterWithAppServer method
 		/// </summary>
 		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
+		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
 		{
 			appServerController.AddAction("/device/videoCodec/isReady", new Action(SendIsReady));
 			appServerController.AddAction("/device/videoCodec/fullStatus", new Action(SendVtcFullMessageObject));
@@ -122,10 +185,24 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				if (call != null)
 					Codec.AcceptCall(call);
 			}));
-			appServerController.AddAction(MessagePath + "/getDirectory", new Action(GetDirectoryRoot));			
-			appServerController.AddAction(MessagePath + "/directoryById", new Action<string>(s => GetDirectory(s)));
-			appServerController.AddAction(MessagePath + "/directorySearch", new Action<string>(s => DirectorySearch(s)));
-            appServerController.AddAction(MessagePath + "/getCallHistory", new Action(GetCallHistory));
+
+            // Directory actions
+            var dirCodec = Codec as IHasDirectory;
+            if (dirCodec != null)
+            {
+                appServerController.AddAction(MessagePath + "/getDirectory", new Action(GetDirectoryRoot));
+                appServerController.AddAction(MessagePath + "/directoryById", new Action<string>(s => GetDirectory(s)));
+                appServerController.AddAction(MessagePath + "/directorySearch", new Action<string>(s => DirectorySearch(s)));
+                appServerController.AddAction(MessagePath + "/directoryBack", new Action(GetPreviousDirectory));
+            }
+
+            // History actions
+            var recCodec = Codec as IHasCallHistory;
+            if (recCodec != null)
+            {
+                appServerController.AddAction(MessagePath + "/getCallHistory", new Action(GetCallHistory));
+            }
+
 			appServerController.AddAction(MessagePath + "/privacyModeOn", new Action(Codec.PrivacyModeOn));
 			appServerController.AddAction(MessagePath + "/privacyModeOff", new Action(Codec.PrivacyModeOff));
 			appServerController.AddAction(MessagePath + "/privacyModeToggle", new Action(Codec.PrivacyModeToggle));
@@ -215,12 +292,28 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				return;
 			}
 
-			PostStatusMessage(new
-			{
-				currentDirectory = dirCodec.DirectoryRoot
-			});
+            dirCodec.SetCurrentDirectoryToRoot();
+
+            //PostStatusMessage(new
+            //{
+            //    currentDirectory = dirCodec.DirectoryRoot
+            //});
 		}
 
+        /// <summary>
+        /// Requests the parent folder contents
+        /// </summary>
+        void GetPreviousDirectory()
+        {
+            var dirCodec = Codec as IHasDirectory;
+            if (dirCodec == null)
+            {
+                return;
+            }
+
+            dirCodec.GetDirectoryParentFolderContents();
+        }
+
 		/// <summary>
 		/// Handler for codec changes
 		/// </summary>
@@ -271,8 +364,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				},
 				showSelfViewByDefault = Codec.ShowSelfViewByDefault,
 				hasDirectory = Codec is IHasDirectory,
+                hasDirectorySearch = true,
                 hasRecents = Codec is IHasCallHistory,
-                hasCameras = Codec is IHasCameraControl
+                hasCameras = Codec is IHasCodecCameras
 			});
 		}
 	}

PepperDashEssentials/AppServer/MobileControlConfig.cs

@@ -13,7 +13,7 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-    public class CotijaConfig
+    public class MobileControlConfig
     {       
 		[JsonProperty("serverUrl")]
         public string ServerUrl { get; set; }
@@ -25,7 +25,7 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-	public class CotijaDdvc01RoomBridgePropertiesConfig
+	public class MobileControlDdvc01RoomBridgePropertiesConfig
 	{
 		[JsonProperty("eiscId")]
 		public string EiscId { get; set; }

PepperDashEssentials/AppServer/MobileControlDdvc01DeviceBridge.cs

@@ -8,19 +8,19 @@ using Crestron.SimplSharpPro.EthernetCommunication;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
 	/// <summary>
 	/// Represents a generic device connection through to and EISC for DDVC01
 	/// </summary>
-	public class CotijaDdvc01DeviceBridge : Device, IChannel, INumericKeypad 
+	public class MobileControlDdvc01DeviceBridge : Device, IChannel, INumericKeypad 
 	{
 		/// <summary>
 		/// EISC used to talk to Simpl
 		/// </summary>
 		ThreeSeriesTcpIpEthernetIntersystemCommunications EISC;
 
-		public CotijaDdvc01DeviceBridge(string key, string name, ThreeSeriesTcpIpEthernetIntersystemCommunications eisc)
+		public MobileControlDdvc01DeviceBridge(string key, string name, ThreeSeriesTcpIpEthernetIntersystemCommunications eisc)
 			: base(key, name)
 		{
 			EISC = eisc;

PepperDashEssentials/AppServer/RoomBridges/MobileControlBridgeBase.cs

@@ -12,15 +12,15 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-	public abstract class CotijaBridgeBase: Device
+	public abstract class MobileControlBridgeBase: Device
 	{
-		public CotijaSystemController Parent { get; private set; }
+		public MobileControlSystemController Parent { get; private set; }
 
 		public string UserCode { get; private set; }
 
 		public abstract string RoomName { get; }
 
-		public CotijaBridgeBase(string key, string name)
+		public MobileControlBridgeBase(string key, string name)
 			: base(key, name)
 		{
 		}
@@ -30,7 +30,7 @@ namespace PepperDash.Essentials
 		/// as adding actions to parent
 		/// </summary>
 		/// <param name="parent"></param>
-		public virtual void AddParent(CotijaSystemController parent)
+		public virtual void AddParent(MobileControlSystemController parent)
 		{
 			Parent = parent;
 		}

PepperDashEssentials/AppServer/RoomBridges/MobileControlDdvc01RoomBridge.cs

@@ -16,9 +16,9 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Room.Config;
 
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
-	public class CotijaDdvc01RoomBridge : CotijaBridgeBase, IDelayedConfiguration
+	public class MobileControlDdvc01RoomBridge : MobileControlBridgeBase, IDelayedConfiguration
 	{
 		public class BoolJoin
 		{
@@ -27,6 +27,11 @@ namespace PepperDash.Essentials.Room.Cotija
 			/// </summary>
 			public const uint RoomIsOn = 301;
 
+			/// <summary>
+			/// 12
+			/// </summary>
+			public const uint PrivacyMute = 12;
+
 			/// <summary>
 			/// 41
 			/// </summary>
@@ -38,15 +43,15 @@ namespace PepperDash.Essentials.Room.Cotija
 			/// <summary>
 			/// 51
 			/// </summary>
-			public const uint ActivitySharePress = 51;
+			public const uint ActivityShare = 51;
 			/// <summary>
 			/// 52
 			/// </summary>
-			public const uint ActivityPhoneCallPress = 52;
+			public const uint ActivityPhoneCall = 52;
 			/// <summary>
 			/// 53
 			/// </summary>
-			public const uint ActivityVideoCallPress = 53;
+			public const uint ActivityVideoCall = 53;
 
 			/// <summary>
 			/// 1
@@ -76,6 +81,7 @@ namespace PepperDash.Essentials.Room.Cotija
 			/// 72
 			/// </summary>
 			public const uint SourceHasChanged = 71;
+
 			/// <summary>
 			/// 261 - The start of the range of speed dial visibles
 			/// </summary>
@@ -85,9 +91,25 @@ namespace PepperDash.Essentials.Room.Cotija
 			/// </summary>
 			public const uint ConfigIsReady = 501;
 			/// <summary>
+			/// 502
+			/// </summary>
+			public const uint HideVideoConfRecents = 502;
+			/// <summary>
+			/// 503
+			/// </summary>
+			public const uint ShowCameraWhenNotInCall = 503;
+			/// <summary>
+			/// 504
+			/// </summary>
+			public const uint UseSourceEnabled = 504;
+			/// <summary>
 			/// 601
 			/// </summary>
-			public const uint SourceShareDisableStartJoin = 601;
+			public const uint SourceShareDisableJoinStart = 601;
+			/// <summary>
+			/// 621
+			/// </summary>
+			public const uint SourceIsEnabledJoinStart = 621;
 
 		}
 
@@ -108,7 +130,7 @@ namespace PepperDash.Essentials.Room.Cotija
 			/// <summary>
 			/// 101
 			/// </summary>
-			public const uint VolumeSliderCount = 101;
+			public const uint NumberOfAuxFaders = 101;
 		}
 
 		public class StringJoin
@@ -214,7 +236,7 @@ namespace PepperDash.Essentials.Room.Cotija
 			}
 		}
 
-		CotijaDdvc01DeviceBridge SourceBridge;
+		MobileControlDdvc01DeviceBridge SourceBridge;
 
 		Ddvc01AtcMessenger AtcMessenger;
 		Ddvc01VtcMessenger VtcMessenger;
@@ -226,7 +248,7 @@ namespace PepperDash.Essentials.Room.Cotija
 		/// <param name="key"></param>
 		/// <param name="name"></param>
 		/// <param name="ipId"></param>
-		public CotijaDdvc01RoomBridge(string key, string name, uint ipId)
+		public MobileControlDdvc01RoomBridge(string key, string name, uint ipId)
 			: base(key, name)
 		{
 			try
@@ -236,7 +258,7 @@ namespace PepperDash.Essentials.Room.Cotija
 				if (reg != Crestron.SimplSharpPro.eDeviceRegistrationUnRegistrationResponse.Success)
 					Debug.Console(0, this, "Cannot connect EISC at IPID {0}: \r{1}", ipId, reg);
 
-				SourceBridge = new CotijaDdvc01DeviceBridge(key + "-sourceBridge", "DDVC01 source bridge", EISC);
+				SourceBridge = new MobileControlDdvc01DeviceBridge(key + "-sourceBridge", "DDVC01 source bridge", EISC);
 				DeviceManager.AddDevice(SourceBridge);
 			}
 			catch (Exception)
@@ -319,16 +341,30 @@ namespace PepperDash.Essentials.Room.Cotija
 			}));
 
 			Parent.AddAction(@"/room/room1/defaultsource", new Action(() => 
-				EISC.PulseBool(BoolJoin.ActivitySharePress)));
-			Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityVideoCallPress)));
+				EISC.PulseBool(BoolJoin.ActivityShare)));
 			Parent.AddAction(@"/room/room1/activityPhone", new Action(() =>
-				EISC.PulseBool(BoolJoin.ActivityPhoneCallPress)));
+				EISC.PulseBool(BoolJoin.ActivityPhoneCall)));
+			Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
+				EISC.PulseBool(BoolJoin.ActivityVideoCall)));
 
 			Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u => 
 				EISC.SetUshort(UshortJoin.MasterVolumeLevel, u)));
 			Parent.AddAction(@"/room/room1/volumes/master/muteToggle", new Action(() => 
 				EISC.PulseBool(BoolJoin.MasterVolumeIsMuted)));
+			Parent.AddAction(@"/room/room1/volumes/master/privacyMuteToggle", new Action(() =>
+				EISC.PulseBool(BoolJoin.PrivacyMute)));
+
+
+			// /xyzxyz/volumes/master/muteToggle ---> BoolInput[1]
+
+			for (uint i = 2; i <= 7; i++)
+			{
+				var index = i;
+				Parent.AddAction(string.Format(@"/room/room1/volumes/level-{0}/level", index), new Action<ushort>(u =>
+					EISC.SetUshort(index, u)));
+				Parent.AddAction(string.Format(@"/room/room1/volumes/level-{0}/muteToggle", index), new Action(() =>
+					EISC.PulseBool(index)));
+			}
 
 			Parent.AddAction(@"/room/room1/shutdownStart", new Action(() =>
 				EISC.PulseBool(BoolJoin.ShutdownStart)));
@@ -388,6 +424,9 @@ namespace PepperDash.Essentials.Room.Cotija
                     }
                 }));
 
+			// map MasterVolumeIsMuted join -> status/volumes/master/muted
+			// 
+
 			EISC.SetBoolSigAction(BoolJoin.MasterVolumeIsMuted, b =>
                 PostStatusMessage(new
                 {
@@ -399,7 +438,55 @@ namespace PepperDash.Essentials.Room.Cotija
                         }
                     }
                 }));
+			EISC.SetBoolSigAction(BoolJoin.PrivacyMute, b => 
+				PostStatusMessage(new
+				{
+					volumes = new 
+					{
+						master = new 
+						{
+							privacyMuted = b
+						}
+					}
+				}));
 
+			for (uint i = 2; i <= 7; i++)
+			{
+				var index = i; // local scope for lambdas
+				EISC.SetUShortSigAction(index, u => // start at join 2
+				{
+					// need a dict in order to create the level-n property on auxFaders
+					var dict = new Dictionary<string, object>();
+					dict.Add("level-" + index, new { level = u });
+					PostStatusMessage(new
+					{
+						volumes = new
+						{
+							auxFaders = dict,
+						}
+					});
+				});
+				EISC.SetBoolSigAction(index, b =>
+				{
+					// need a dict in order to create the level-n property on auxFaders
+					var dict = new Dictionary<string, object>();
+					dict.Add("level-" + index, new { muted = b });
+					PostStatusMessage(new
+					{
+						volumes = new
+						{
+							auxFaders = dict,
+						}
+					});
+				});
+			}
+
+			EISC.SetUShortSigAction(UshortJoin.NumberOfAuxFaders, u => 
+				PostStatusMessage(new {
+					volumes = new {
+						numberOfAuxFaders = u,
+					}
+				}));
 
 			// shutdown things
 			EISC.SetSigTrueAction(BoolJoin.ShutdownCancel, new Action(() =>
@@ -421,6 +508,23 @@ namespace PepperDash.Essentials.Room.Cotija
 
 			// Config things
 			EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues);
+
+			// Activity modes
+			EISC.SetSigTrueAction(BoolJoin.ActivityShare, () => UpdateActivity(1));
+			EISC.SetSigTrueAction(BoolJoin.ActivityPhoneCall, () => UpdateActivity(2));
+			EISC.SetSigTrueAction(BoolJoin.ActivityVideoCall, () => UpdateActivity(3));
+		}
+
+
+		/// <summary>
+		/// Updates activity states
+		/// </summary>
+		void UpdateActivity(int mode)
+		{
+			PostStatusMessage(new
+			{
+				activityMode = mode,
+			});
 		}
 
 		/// <summary>
@@ -471,24 +575,13 @@ namespace PepperDash.Essentials.Room.Cotija
 			rmProps.RoomPhoneNumber = EISC.StringOutput[StringJoin.ConfigRoomPhoneNumber].StringValue;
 			rmProps.RoomURI = EISC.StringOutput[StringJoin.ConfigRoomURI].StringValue;
 			rmProps.SpeedDials = new List<DDVC01SpeedDial>();
-			// add speed dials as long as there are more - up to 4
-
-#warning fix speed dials - 512-515 names, 516-519 numbers
-			for (uint i = 512; i <= 519; i = i + 2)
-			{
-				var num = EISC.StringOutput[i].StringValue;
-				if (string.IsNullOrEmpty(num))
-					break;
-				var name = EISC.StringOutput[i + 1].StringValue;
-				rmProps.SpeedDials.Add(new DDVC01SpeedDial { Number = num, Name = name});
-			}
 
 			// This MAY need a check 
 			rmProps.AudioCodecKey = "audioCodec";
 			rmProps.VideoCodecKey = "videoCodec";
 
 			// volume control names
-			var volCount = EISC.UShortOutput[UshortJoin.VolumeSliderCount].UShortValue;
+			var volCount = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
 
             //// use Volumes object or?
             //rmProps.VolumeSliderNames = new List<string>();
@@ -497,7 +590,7 @@ namespace PepperDash.Essentials.Room.Cotija
             //    rmProps.VolumeSliderNames.Add(EISC.StringInput[i].StringValue);
             //}
 
-			// There should be cotija devices in here, I think...
+			// There should be Mobile Control devices in here, I think...
 			if(co.Devices == null)
 				co.Devices = new List<DeviceConfig>();
 
@@ -534,12 +627,17 @@ namespace PepperDash.Essentials.Room.Cotija
 			for (uint i = 0; i <= 19; i++)
 			{
 				var name = EISC.StringOutput[StringJoin.SourceNameJoinStart + i].StringValue;
-				if(string.IsNullOrEmpty(name))
+				if (EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue
+					&& !EISC.BooleanOutput[BoolJoin.SourceIsEnabledJoinStart + i].BoolValue)
+				{
+					continue;
+				}		
+				else if(!EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue && string.IsNullOrEmpty(name))
 					break;
 				var icon = EISC.StringOutput[StringJoin.SourceIconJoinStart + i].StringValue;
 				var key = EISC.StringOutput[StringJoin.SourceKeyJoinStart + i].StringValue;
 				var type = EISC.StringOutput[StringJoin.SourceTypeJoinStart + i].StringValue;
-				var disableShare = EISC.BooleanOutput[BoolJoin.SourceShareDisableStartJoin + i].BoolValue;
+				var disableShare = EISC.BooleanOutput[BoolJoin.SourceShareDisableJoinStart + i].BoolValue;
 
 				Debug.Console(0, this, "Adding source {0} '{1}'", key, name);
 				var newSLI = new SourceListItem{
@@ -575,7 +673,7 @@ namespace PepperDash.Essentials.Room.Cotija
 
 			co.SourceLists.Add("default", newSl);
 
-			// build "audioCodec" config if we need
+			// Build "audioCodec" config if we need
 			if (!string.IsNullOrEmpty(rmProps.AudioCodecKey))
 			{
 				var acFavs = new List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
@@ -610,25 +708,11 @@ namespace PepperDash.Essentials.Room.Cotija
 				co.Devices.Add(acConf);
 			}
 
+			// Build Video codec config
 			if (!string.IsNullOrEmpty(rmProps.VideoCodecKey))
 			{
-#warning Break out these video codec favs
+				// No favorites, for now?
 				var favs = new List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
-				for (uint i = 0; i < 4; i++)
-				{
-					if (!EISC.GetBool(BoolJoin.SpeedDialVisibleStartJoin + i))
-					{
-						break;
-					}
-					favs.Add(new PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem()
-					{
-						Name = EISC.GetString(StringJoin.SpeedDialNameStartJoin + i),
-						Number = EISC.GetString(StringJoin.SpeedDialNumberStartJoin + i),
-						Type = PepperDash.Essentials.Devices.Common.Codec.eCodecCallType.Audio
-					});
-				}
-
-
 
 				// cameras
 				var camsProps = new List<object>();
@@ -689,39 +773,42 @@ namespace PepperDash.Essentials.Room.Cotija
 		{
 			if (ConfigIsLoaded)
 			{
-                var count = EISC.UShortOutput[801].UShortValue;
+                var count = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
 
                 Debug.Console(1, this, "The Fader Count is : {0}", count);
 
                 // build volumes object, serialize and put in content of method below
 
-                var auxFaders = new List<Volume>();
-
                 // Create auxFaders
-                for (uint i = 2; i <= count; i++)
-                {
-                    auxFaders.Add(
-                        new Volume(string.Format("level-{0}", i), 
-                            EISC.UShortOutput[i].UShortValue,
-                            EISC.BooleanOutput[i].BoolValue,
-                            EISC.StringOutput[800 + i].StringValue,
-                            true,
-                            "someting.png"));
-                }
+				var auxFaderDict = new Dictionary<string, Volume>();
+				for (uint i = 2; i <= count; i++)
+				{
+					auxFaderDict.Add("level-" + i,
+						new Volume("level-" + i,
+							EISC.UShortOutput[i].UShortValue,
+							EISC.BooleanOutput[i].BoolValue,
+							EISC.StringOutput[i].StringValue,
+							true,
+							"someting.png"));
+				}
 
                 var volumes = new Volumes();
 
                 volumes.Master = new Volume("master", 
                                 EISC.UShortOutput[UshortJoin.MasterVolumeLevel].UShortValue,
                                 EISC.BooleanOutput[BoolJoin.MasterVolumeIsMuted].BoolValue,
-                  				EISC.StringOutput[801].StringValue,
+                  				EISC.StringOutput[1].StringValue,
 				                true,
 				                "something.png");
+				volumes.Master.HasPrivacyMute = true;
+				volumes.Master.PrivacyMuted = EISC.BooleanOutput[BoolJoin.PrivacyMute].BoolValue;
 
-                volumes.AuxFaders = auxFaders;
+                volumes.AuxFaders = auxFaderDict;
+				volumes.NumberOfAuxFaders = EISC.UShortInput[UshortJoin.NumberOfAuxFaders].UShortValue;
 
                 PostStatusMessage(new
                     {
+						activityMode = GetActivityMode(),
                         isOn = EISC.BooleanOutput[BoolJoin.RoomIsOn].BoolValue,
                         selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue,
                         volumes = volumes
@@ -736,6 +823,18 @@ namespace PepperDash.Essentials.Room.Cotija
 			}
 		}
 
+		/// <summary>
+		/// Returns the activity mode int
+		/// </summary>
+		/// <returns></returns>
+		int GetActivityMode()
+		{
+			if (EISC.BooleanOutput[BoolJoin.ActivityPhoneCall].BoolValue) return 2;
+			else if (EISC.BooleanOutput[BoolJoin.ActivityShare].BoolValue) return 1;
+			else if (EISC.BooleanOutput[BoolJoin.ActivityVideoCall].BoolValue) return 3;
+			return 0;
+		}
+
 		/// <summary>
 		/// Helper for posting status message
 		/// </summary>
@@ -792,6 +891,7 @@ namespace PepperDash.Essentials.Room.Cotija
 			var d = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
 			{
 				{ "laptop", "pc" },
+				{ "pc", "pc" },
 				{ "wireless", "genericsource" },
 				{ "iptv", "settopbox" }
 

PepperDashEssentials/AppServer/RoomBridges/MobileControlEssentialsHuddleSpaceRoomBridge.cs

@@ -9,14 +9,14 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.AppServer.Messengers;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Cotija;
+using PepperDash.Essentials.Room.MobileControl;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
 
 namespace PepperDash.Essentials
 {
-    public class CotijaEssentialsHuddleSpaceRoomBridge : CotijaBridgeBase
+    public class MobileConrolEssentialsHuddleSpaceRoomBridge : MobileControlBridgeBase
     {
 
         public EssentialsRoomBase Room { get; private set; }
@@ -25,6 +25,7 @@ namespace PepperDash.Essentials
 
         public AudioCodecBaseMessenger ACMessenger { get; private set; }
 
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -41,7 +42,7 @@ namespace PepperDash.Essentials
 		/// </summary>
 		/// <param name="parent"></param>
 		/// <param name="room"></param>
-        public CotijaEssentialsHuddleSpaceRoomBridge(EssentialsRoomBase room):
+        public MobileConrolEssentialsHuddleSpaceRoomBridge(EssentialsRoomBase room):
 			base("mobileControlBridge-essentialsHuddle", "Essentials Mobile Control Bridge-Huddle")
         {
             Room = room;   
@@ -51,7 +52,7 @@ namespace PepperDash.Essentials
 		/// Override of base: calls base to add parent and then registers actions and events.
 		/// </summary>
 		/// <param name="parent"></param>
-		public override void AddParent(CotijaSystemController parent)
+		public override void AddParent(MobileControlSystemController parent)
 		{
 			base.AddParent(parent);
 
@@ -92,7 +93,7 @@ namespace PepperDash.Essentials
 
 			var sscRoom = Room as IHasCurrentSourceInfoChange;
 			if(sscRoom != null)
-				sscRoom.CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);
+				sscRoom.CurrentSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);
 
 			var vcRoom = Room as IHasVideoCodec;
 			if (vcRoom != null && vcRoom.VideoCodec != null)
@@ -168,19 +169,6 @@ namespace PepperDash.Essentials
 			});
 		}
 
-        ///// <summary>
-        ///// Handler for codec changes
-        ///// </summary>
-        //void codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
-        //{
-        //    PostStatusMessage(new
-        //    {
-        //        calls = GetCallsMessageObject(),
-        //        //vtc = GetVtcCallsMessageObject()
-        //    });
-
-        //}
-
 		/// <summary>
 		/// Helper for posting status message
 		/// </summary>
@@ -333,7 +321,7 @@ namespace PepperDash.Essentials
         }
 
 
-        void Room_CurrentSingleSourceChange(EssentialsRoomBase room, PepperDash.Essentials.Core.SourceListItem info, ChangeType type)
+        void Room_CurrentSingleSourceChange(PepperDash.Essentials.Core.SourceListItem info, ChangeType type)
         {
             /* Example message
              * {
@@ -394,11 +382,14 @@ namespace PepperDash.Essentials
                     if (dev is ITransport)
                         (dev as ITransport).LinkActions(Parent);
 
-					var srcRm = room as IHasCurrentSourceInfoChange;
-					PostStatusMessage(new
-					{
-						selectedSourceKey = srcRm.CurrentSourceInfoKey
-					});
+					var srcRm = Room as IHasCurrentSourceInfoChange;
+                    if (srcRm != null)
+                    {
+                        PostStatusMessage(new
+                        {
+                            selectedSourceKey = srcRm.CurrentSourceInfoKey
+                        });
+                    }
                 }
             }
         }
@@ -431,45 +422,6 @@ namespace PepperDash.Essentials
 				volumes = volumes
 			});
         }
-
-        ///// <summary>
-        ///// Helper to return a anonymous object with the call data for JSON message
-        ///// </summary>
-        ///// <returns></returns>
-        //object GetCallsMessageObject()
-        //{
-        //    var callRm = Room as IHasVideoCodec;
-        //    if (callRm == null)
-        //        return null;
-        //    return new
-        //    {
-        //        activeCalls = callRm.VideoCodec.ActiveCalls,
-        //        callType = callRm.CallTypeFeedback.IntValue,
-        //        inCall = callRm.InCallFeedback.BoolValue,
-        //        isSharing = callRm.IsSharingFeedback.BoolValue,
-        //        privacyModeIsOn = callRm.PrivacyModeIsOnFeedback.BoolValue
-        //    };
-        //}
-
-        ///// <summary>
-        ///// Helper method to build call status for vtc
-        ///// </summary>
-        ///// <returns></returns>
-        //object GetVtcCallsMessageObject()
-        //{
-        //    var callRm = Room as IHasVideoCodec;
-        //    object vtc = null;
-        //    if (callRm != null)
-        //    {
-        //        var codec = callRm.VideoCodec;
-        //        vtc = new
-        //        {
-        //            isInCall = codec.IsInCall,
-        //            calls = codec.ActiveCalls
-        //        };
-        //    }
-        //    return vtc;
-        //}     
     }
 
 	/// <summary>

PepperDashEssentials/AppServer/RoomBridges/SourceDeviceMapDictionary.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
 
     /// <summary>

PepperDashEssentials/AppServer/Volumes.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using Newtonsoft.Json;
 
-namespace PepperDash.Essentials.Room.Cotija
+namespace PepperDash.Essentials.Room.MobileControl
 {
 	public class Volumes
 	{
@@ -14,11 +14,14 @@ namespace PepperDash.Essentials.Room.Cotija
 		public Volume Master { get; set; }
 
 		[JsonProperty("auxFaders")]
-		public List<Volume> AuxFaders { get; set; }
+		public Dictionary<string, Volume> AuxFaders { get; set; }
+
+		[JsonProperty("numberOfAuxFaders")]
+		public int NumberOfAuxFaders { get; set; }
 
 		public Volumes()
 		{
-			AuxFaders = new List<Volume>();	
+			AuxFaders = new Dictionary<string, Volume>();	
 		}
 	}
 
@@ -39,6 +42,13 @@ namespace PepperDash.Essentials.Room.Cotija
 		[JsonProperty("hasMute")]
 		public bool HasMute { get; set; }
 
+		[JsonProperty("hasPrivacyMute")]
+		public bool HasPrivacyMute { get; set; }
+
+		[JsonProperty("privacyMuted")]
+		public bool PrivacyMuted { get; set; }
+
+
 		[JsonProperty("muteIcon")]
 		public string MuteIcon { get; set; }
 

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.DM.AirMedia;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges
+{
+	public static class AirMediaControllerApiExtensions
+	{
+        public static void LinkToApi(this AirMediaController airMedia, BasicTriList trilist, uint joinStart, string joinMapKey)
+		{
+            AirMediaControllerJoinMap joinMap = new AirMediaControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<AirMediaControllerJoinMap>(joinMapSerialized);
+
+			joinMap.OffsetJoinNumbers(joinStart);
+
+			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+			Debug.Console(0, "Linking to Airmedia: {0}", airMedia.Name);
+
+			trilist.StringInput[joinMap.Name].StringValue = airMedia.Name;			
+
+			var commMonitor = airMedia as ICommunicationMonitor;
+            if (commMonitor != null)
+            {
+                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            }
+
+            airMedia.IsInSessionFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsInSession]);
+            airMedia.HdmiVideoSyncDetectedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiVideoSync]);
+
+            trilist.SetSigTrueAction(joinMap.AutomaticInputRoutingEnabled, new Action( airMedia.AirMedia.DisplayControl.EnableAutomaticRouting));
+            trilist.SetSigFalseAction(joinMap.AutomaticInputRoutingEnabled, new Action( airMedia.AirMedia.DisplayControl.DisableAutomaticRouting));
+            airMedia.AutomaticInputRoutingEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AutomaticInputRoutingEnabled]);
+
+            trilist.SetUShortSigAction(joinMap.VideoOut, new Action<ushort>((u) => airMedia.SelectVideoOut(u)));
+
+            airMedia.VideoOutFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoOut]);
+            airMedia.ErrorFeedback.LinkInputSig(trilist.UShortInput[joinMap.ErrorFB]);
+            airMedia.NumberOfUsersConnectedFeedback.LinkInputSig(trilist.UShortInput[joinMap.NumberOfUsersConnectedFB]);
+
+            trilist.SetUShortSigAction(joinMap.LoginCode, new Action<ushort>((u) => airMedia.AirMedia.AirMedia.LoginCode.UShortValue = u));
+            airMedia.LoginCodeFeedback.LinkInputSig(trilist.UShortInput[joinMap.LoginCode]);
+
+            airMedia.ConnectionAddressFeedback.LinkInputSig(trilist.StringInput[joinMap.ConnectionAddressFB]);
+            airMedia.HostnameFeedback.LinkInputSig(trilist.StringInput[joinMap.HostnameFB]);
+            airMedia.SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback]);
+		}
+	}	
+}

PepperDashEssentials/Bridges/AppleTvBridge.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public static class AppleTvApiExtensions
+    {
+        public static void LinkToApi(this AppleTV appleTv, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            AppleTvJoinMap joinMap = new AppleTvJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if(!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<AppleTvJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(0, "Linking to Bridge Type {0}", appleTv.GetType().Name.ToString());
+
+            trilist.SetBoolSigAction(joinMap.UpArrow, (b) => appleTv.Up(b));
+            trilist.SetBoolSigAction(joinMap.DnArrow, (b) => appleTv.Down(b));
+            trilist.SetBoolSigAction(joinMap.LeftArrow, (b) => appleTv.Left(b));
+            trilist.SetBoolSigAction(joinMap.RightArrow, (b) => appleTv.Right(b));
+            trilist.SetBoolSigAction(joinMap.Select, (b) => appleTv.Select(b));
+            trilist.SetBoolSigAction(joinMap.Menu, (b) => appleTv.Menu(b));
+            trilist.SetBoolSigAction(joinMap.PlayPause, (b) => appleTv.Play(b));
+        }
+    }
+}

PepperDashEssentials/Bridges/BridgeBase.cs

@@ -12,6 +12,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Lighting;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.CrestronIO;
 using PepperDash.Essentials.DM;
@@ -56,7 +57,6 @@ namespace PepperDash.Essentials.Bridges
 
         public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
 
-
         public EiscApi(DeviceConfig dc) :
             base(dc.Key)
         {
@@ -78,7 +78,12 @@ namespace PepperDash.Essentials.Bridges
 
                     if (device != null)
                     {
-                        if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
+                        if (device is IBridge)      // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
+                        {
+                            (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
                         {
                             (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
@@ -88,22 +93,34 @@ namespace PepperDash.Essentials.Bridges
                             (device as GenericComm).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-						//else if (device is CameraBase)
-						//{
-						//    (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-						//    continue;
-						//}
-						//else if (device is PepperDash.Essentials.Core.TwoWayDisplayBase)
-						//{
-						//    (device as TwoWayDisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-						//    continue;
-						//}
-                        else if (device is DmChassisController)
+                        else if (device is CameraBase)
                         {
+                            (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+						else if (device is PepperDash.Essentials.Core.DisplayBase)
+						{
+							(device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+							continue;
+						}
+                        else if (device is DmChassisController) {
                             (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-						
+                        else if (device is DmBladeChassisController) {
+                            (device as DmBladeChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is DmpsRoutingController)
+                        {
+                            (device as DmpsRoutingController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is DmpsAudioOutputController)
+                        {
+                            (device as DmpsAudioOutputController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
                         else if (device is DmTxControllerBase)
                         {
                             (device as DmTxControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
@@ -124,16 +141,31 @@ namespace PepperDash.Essentials.Bridges
                             (device as IDigitalInput).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-						//else if (device is LightingBase)
-						//{
-						//    (device as LightingBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-						//    continue;
-						//}
-						//else if (device is DigitalLogger)
-						//{
-						//    (device as DigitalLogger).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-						//    continue;
-						//}
+                        else if (device is AppleTV)
+                        {
+                            (device as AppleTV).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is HdMdxxxCEController)
+                        {
+                            (device as HdMdxxxCEController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is LightingBase)
+                        {
+                            (device as LightingBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is DigitalLogger)
+                        {
+                            (device as DigitalLogger).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is PepperDash.Essentials.Devices.Common.Occupancy.GlsOccupancySensorBaseController)
+                        {
+                            (device as PepperDash.Essentials.Devices.Common.Occupancy.GlsOccupancySensorBaseController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
                     }
                 }
 
@@ -141,6 +173,66 @@ namespace PepperDash.Essentials.Bridges
             });
         }
 
+        /// <summary>
+        /// Used for debugging to trigger an action based on a join number and type
+        /// </summary>
+        /// <param name="join"></param>
+        /// <param name="type"></param>
+        public void ExecuteJoinAction(uint join, string type, object state)
+        {
+            try
+            {
+                switch (type.ToLower())
+                {
+                    case "digital":
+                        {
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
+                            if (uo != null)
+                            {
+                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToBoolean(state));
+                            }
+                            else
+                                Debug.Console(1, this, "User Action is null.  Nothing to Execute");
+                            break;
+                        }
+                    case "analog":
+                        {
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
+                            if (uo != null)
+                            {
+                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToUInt16(state));
+                            }
+                            else
+                                Debug.Console(1, this, "User Action is null.  Nothing to Execute"); break;
+                        }
+                    case "serial":
+                        {
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
+                            if (uo != null)
+                            {
+                                Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToString(state));
+                            }
+                            else
+                                Debug.Console(1, this, "User Action is null.  Nothing to Execute");
+                            break;
+                        }
+                    default:
+                        {
+                            Debug.Console(1, "Unknown join type.  Use digital/serial/analog");
+                            break;
+                        }
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error: {0}", e);
+            }
+
+        }
+
         /// <summary>
         /// Handles incoming sig changes
         /// </summary>
@@ -148,15 +240,26 @@ namespace PepperDash.Essentials.Bridges
         /// <param name="args"></param>
         void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
         {
-            if (Debug.Level >= 1)
-                Debug.Console(1, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-            var uo = args.Sig.UserObject;
-            if (uo is Action<bool>)
-                (uo as Action<bool>)(args.Sig.BoolValue);
-            else if (uo is Action<ushort>)
-                (uo as Action<ushort>)(args.Sig.UShortValue);
-            else if (uo is Action<string>)
-                (uo as Action<string>)(args.Sig.StringValue);
+            try
+            {
+                if (Debug.Level >= 1)
+                    Debug.Console(1, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                var uo = args.Sig.UserObject;
+                if (uo != null)
+                {
+                    Debug.Console(1, this, "Executing Action: {0}", uo.ToString());
+                    if (uo is Action<bool>)
+                        (uo as Action<bool>)(args.Sig.BoolValue);
+                    else if (uo is Action<ushort>)
+                        (uo as Action<ushort>)(args.Sig.UShortValue);
+                    else if (uo is Action<string>)
+                        (uo as Action<string>)(args.Sig.StringValue);
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
+            }
         }
     }
 

PepperDashEssentials/Bridges/BridgeFactory.cs

@@ -13,129 +13,127 @@ using PepperDash.Essentials.Bridges;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
-namespace PepperDash.Essentials 
-
+namespace PepperDash.Essentials
 {
-public class BridgeFactory 
-{
-	public static IKeyed GetDevice(DeviceConfig dc) 
-	{
-		// ? why is this static JTA 2018-06-13? 
-			
-		var key = dc.Key;
-		var name = dc.Name;
-		var type = dc.Type;
-		var properties = dc.Properties;
-		var propAnon = new { };
-			
-		var typeName = dc.Type.ToLower();
-		var groupName = dc.Group.ToLower();
+    public class BridgeFactory
+    {
+        public static IKeyed GetDevice(DeviceConfig dc)
+        {
+            // ? why is this static JTA 2018-06-13? 
 
-		//Debug.Console(2, "Name {0}, Key {1}, Type {2}, Properties {3}", name, key, type, properties.ToString());
+            var key = dc.Key;
+            var name = dc.Name;
+            var type = dc.Type;
+            var properties = dc.Properties;
+            var propAnon = new { };
 
-		if (typeName == "eiscapi") 
-		{
-			return new EiscApi(dc);
-		}
+            var typeName = dc.Type.ToLower();
+            var groupName = dc.Group.ToLower();
 
-		return null;
-	}
+            //Debug.Console(2, "Name {0}, Key {1}, Type {2}, Properties {3}", name, key, type, properties.ToString());
+
+            if (typeName == "eiscapi")
+            {
+                return new EiscApi(dc);
+            }
+
+            return null;
+        }
+    }
+
+
+    public class CommBridge : Device
+    {
+        public CommBridgeProperties Properties { get; private set; }
+
+        public List<IBasicCommunication> CommDevices { get; private set; }
+
+        public CommBridge(string key, string name, JToken properties)
+            : base(key, name)
+        {
+            Properties = JsonConvert.DeserializeObject<CommBridgeProperties>(properties.ToString());
+        }
+
+        public override bool CustomActivate()
+        {
+            // Create EiscApis 
+            if (Properties.Eiscs != null)
+            {
+                foreach (var eisc in Properties.Eiscs)
+                {
+                    var ApiEisc = new BridgeApiEisc(eisc.IpId, eisc.Hostname);
+                }
+            }
+
+            foreach (var deviceKey in Properties.CommDevices)
+            {
+                var device = DeviceManager.GetDeviceForKey(deviceKey);
+
+                if (device != null)
+                {
+                    Debug.Console(0, "deviceKey {0} Found in Device Manager", device.Key);
+                    CommDevices.Add(device as IBasicCommunication);
+                }
+                else
+                {
+                    Debug.Console(0, "deviceKey {0} Not Found in Device Manager", deviceKey);
+                }
+            }
+
+            // Iterate through all the CommDevices and link up their Actions and Feedbacks
+
+            Debug.Console(0, "Bridge {0} Activated", this.Name);
+
+            return true;
+        }
+    }
+
+
+    public class EiscBridgeProperties
+    {
+        public string ParentDeviceKey { get; set; }
+        public eApiType ApiType { get; set; }
+        public List<EiscProperties> Eiscs { get; set; }
+        public string ApiOverrideFilePath { get; set; }
+
+        public class EiscProperties
+        {
+            public string IpId { get; set; }
+            public string Hostname { get; set; }
+        }
+    }
+
+    public class CommBridgeProperties : EiscBridgeProperties
+    {
+        public List<string> CommDevices { get; set; }
+    }
+
+    public enum eApiType { Eisc = 0 }
+
+    public class BridgeApiEisc
+    {
+        public uint Ipid { get; private set; }
+        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
+
+        public BridgeApiEisc(string ipid, string hostname)
+        {
+            Ipid = (UInt32)int.Parse(ipid, System.Globalization.NumberStyles.HexNumber);
+            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(Ipid, hostname, Global.ControlSystem);
+            Eisc.Register();
+            Eisc.SigChange += Eisc_SigChange;
+            Debug.Console(0, "BridgeApiEisc Created at Ipid {0}", ipid);
+        }
+        void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
+        {
+            if (Debug.Level >= 1)
+                Debug.Console(1, "BridgeApiEisc change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+            var uo = args.Sig.UserObject;
+            if (uo is Action<bool>)
+                (uo as Action<bool>)(args.Sig.BoolValue);
+            else if (uo is Action<ushort>)
+                (uo as Action<ushort>)(args.Sig.UShortValue);
+            else if (uo is Action<string>)
+                (uo as Action<string>)(args.Sig.StringValue);
+        }
+    }
 }
-
-
-public class CommBridge : Device
-{
-	public CommBridgeProperties Properties { get; private set; }
-
-	public List<IBasicCommunication> CommDevices { get; private set; }
-
-	public CommBridge(string key, string name, JToken properties)
-		: base(key, name)
-	{
-		Properties = JsonConvert.DeserializeObject<CommBridgeProperties>(properties.ToString());
-	}
-
-	public override bool CustomActivate()
-	{
-		// Create EiscApis 
-		if (Properties.Eiscs != null)
-		{
-			foreach (var eisc in Properties.Eiscs)
-			{
-				var ApiEisc = new BridgeApiEisc(eisc.IpId, eisc.Hostname);
-			}
-		}
-
-		foreach (var deviceKey in Properties.CommDevices)
-		{
-			var device = DeviceManager.GetDeviceForKey(deviceKey);
-
-			if (device != null)
-			{
-				Debug.Console(0, "deviceKey {0} Found in Device Manager", device.Key);
-				CommDevices.Add(device as IBasicCommunication);
-			}
-			else
-			{
-				Debug.Console(0, "deviceKey {0} Not Found in Device Manager", deviceKey);
-			}
-		}
-
-		// Iterate through all the CommDevices and link up their Actions and Feedbacks
-
-		Debug.Console(0, "Bridge {0} Activated", this.Name);
-
-		return true;
-	}
-}
-
-
-public class EiscBridgeProperties 
-{
-	public string ParentDeviceKey { get; set; }
-	public eApiType ApiType { get; set; } 
-	public List<EiscProperties> Eiscs { get; set; }
-	public string ApiOverrideFilePath { get; set; }
-
-	public class EiscProperties
-	{
-		public string IpId { get; set; }
-		public string Hostname { get; set; }
-	}
-}
-
-public class CommBridgeProperties : EiscBridgeProperties
-{
-	public List<string> CommDevices { get; set; }
-}
-
-public enum eApiType { Eisc = 0 }
-
-public class BridgeApiEisc 
-{
-	public uint Ipid { get; private set; }
-	public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
-
-	public BridgeApiEisc(string ipid, string hostname) 
-	{
-		Ipid = (UInt32)int.Parse(ipid, System.Globalization.NumberStyles.HexNumber);
-		Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(Ipid, hostname, Global.ControlSystem);
-		Eisc.Register();
-		Eisc.SigChange += Eisc_SigChange;
-		Debug.Console(0, "BridgeApiEisc Created at Ipid {0}", ipid);
-	}
-	void Eisc_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args) 
-	{
-		if (Debug.Level >= 1)
-			Debug.Console(1, "BridgeApiEisc change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-		var uo = args.Sig.UserObject;
-		if (uo is Action<bool>)
-			(uo as Action<bool>)(args.Sig.BoolValue);
-		else if (uo is Action<ushort>)
-			(uo as Action<ushort>)(args.Sig.UShortValue);
-		else if (uo is Action<string>)
-			(uo as Action<string>)(args.Sig.StringValue);
-	}
-}
-}
- 

PepperDashEssentials/Bridges/CameraControllerBridge.cs

@@ -1,187 +1,137 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro.DeviceSupport;
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.Devices.Common.Cameras;
 
-//namespace PepperDash.Essentials.Bridges
-//{
-//    public static class CameraControllerApiExtensions
-//    {
+using Newtonsoft.Json;
 
-//        public static BasicTriList _TriList;
-//        public static CameraControllerJoinMap JoinMap; 
-//        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-//        {
-//            JoinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as CameraControllerJoinMap;
-			
-//            _TriList = trilist;
-//            if (JoinMap == null)
-//            {
-//                JoinMap = new CameraControllerJoinMap();
-//            }
-			
-//            JoinMap.OffsetJoinNumbers(joinStart);
-//            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-//            Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
+namespace PepperDash.Essentials.Bridges
+{
+    public static class CameraControllerApiExtensions
+    {
 
-//            var commMonitor = cameraDevice as ICommunicationMonitor;
-//            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
+        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            CameraControllerJoinMap joinMap = new CameraControllerJoinMap();
 
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
-//            trilist.SetBoolSigAction(JoinMap.Left, (b) =>
-//                {
-//                    if (b)
-//                    {
-//                        cameraDevice.PanLeft();
-//                    }
-//                    else
-//                    {
-//                        cameraDevice.Stop();
-//                    }
-//                });
-//            trilist.SetBoolSigAction(JoinMap.Right, (b) =>
-//            {
-//                if (b)
-//                {
-//                    cameraDevice.PanRight();
-//                }
-//                else
-//                {
-//                    cameraDevice.Stop();
-//                }
-//            });
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<CameraControllerJoinMap>(joinMapSerialized);
 
-//            trilist.SetBoolSigAction(JoinMap.Up, (b) =>
-//            {
-//                if (b)
-//                {
-//                    cameraDevice.TiltUp();
-//                }
-//                else
-//                {
-//                    cameraDevice.Stop();
-//                }
-//            });
-//            trilist.SetBoolSigAction(JoinMap.Down, (b) =>
-//            {
-//                if (b)
-//                {
-//                    cameraDevice.TiltDown();
-//                }
-//                else
-//                {
-//                    cameraDevice.Stop();
-//                }
-//            });
+            joinMap.OffsetJoinNumbers(joinStart);
 
-//            trilist.SetBoolSigAction(JoinMap.ZoomIn, (b) =>
-//            {
-//                if (b)
-//                {
-//                    cameraDevice.ZoomIn();
-//                }
-//                else
-//                {
-//                    cameraDevice.Stop();
-//                }
-//            });
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
 
-//            trilist.SetBoolSigAction(JoinMap.ZoomOut, (b) =>
-//            {
-//                if (b)
-//                {
-//                    cameraDevice.ZoomOut();
-//                }
-//                else
-//                {
-//                    cameraDevice.Stop();
-//                }
-//            });
+            var commMonitor = cameraDevice as ICommunicationMonitor;
+            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
 
+            var ptzCamera = cameraDevice as IHasCameraPtzControl;
 
-//            if (cameraDevice.GetType().Name.ToString().ToLower() == "cameravisca")
-//            {
-//                var viscaCamera = cameraDevice as PepperDash.Essentials.Devices.Common.Cameras.CameraVisca;
-//                trilist.SetSigTrueAction(JoinMap.PowerOn, () => viscaCamera.PowerOn());
-//                trilist.SetSigTrueAction(JoinMap.PowerOff, () => viscaCamera.PowerOff());
+            if (ptzCamera != null)
+            {
+                trilist.SetBoolSigAction(joinMap.Left, (b) =>
+                    {
+                        if (b)
+                        {
+                            ptzCamera.PanLeft();
+                        }
+                        else
+                        {
+                            ptzCamera.PanStop();
+                        }
+                    });
+                trilist.SetBoolSigAction(joinMap.Right, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.PanRight();
+                    }
+                    else
+                    {
+                        ptzCamera.PanStop();
+                    }
+                });
 
-//                viscaCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.PowerOn]);
-//                viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[JoinMap.PowerOff]);
+                trilist.SetBoolSigAction(joinMap.Up, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.TiltUp();
+                    }
+                    else
+                    {
+                        ptzCamera.TiltStop();
+                    }
+                });
+                trilist.SetBoolSigAction(joinMap.Down, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.TiltDown();
+                    }
+                    else
+                    {
+                        ptzCamera.TiltStop();
+                    }
+                });
 
-//                viscaCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
-//                for (int i = 0; i < JoinMap.NumberOfPresets; i++)
-//                    {	
-//                        int tempNum = i;
-//                        trilist.SetSigTrueAction((ushort)(JoinMap.PresetRecallOffset + tempNum), () =>
-//                            {
-//                                viscaCamera.RecallPreset(tempNum);
-//                            });
-//                        trilist.SetSigTrueAction((ushort)(JoinMap.PresetSaveOffset + tempNum), () =>
-//                        {
-//                            viscaCamera.SavePreset(tempNum);
-//                        });
-//                    }
-//            }
+                trilist.SetBoolSigAction(joinMap.ZoomIn, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.ZoomIn();
+                    }
+                    else
+                    {
+                        ptzCamera.ZoomStop();
+                    }
+                });
 
-			
-			
-//        }
+                trilist.SetBoolSigAction(joinMap.ZoomOut, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.ZoomOut();
+                    }
+                    else
+                    {
+                        ptzCamera.ZoomStop();
+                    }
+                });
+            }
 
+            if (cameraDevice.GetType().Name.ToString().ToLower() == "cameravisca")
+            {
+                var viscaCamera = cameraDevice as PepperDash.Essentials.Devices.Common.Cameras.CameraVisca;
+                trilist.SetSigTrueAction(joinMap.PowerOn, () => viscaCamera.PowerOn());
+                trilist.SetSigTrueAction(joinMap.PowerOff, () => viscaCamera.PowerOff());
 
-//    }
-//    public class CameraControllerJoinMap : JoinMapBase
-//    {
-//        public uint IsOnline { get; set; }
-//        public uint PowerOff { get; set; }
-//        public uint PowerOn { get; set; }
-//        public uint Up { get; set; }
-//        public uint Down { get; set; }
-//        public uint Left { get; set; }
-//        public uint Right { get; set; }
-//        public uint ZoomIn { get; set; }
-//        public uint ZoomOut { get; set; }
-//        public uint PresetRecallOffset { get; set; }
-//        public uint PresetSaveOffset { get; set; }
-//        public uint NumberOfPresets { get; set;  }
+                viscaCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
+                viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
 
-//        public CameraControllerJoinMap()
-//        {
-//            // Digital
-//            IsOnline = 9;
-//            PowerOff = 8;
-//            PowerOn = 7;
-//            Up = 1;
-//            Down = 2;
-//            Left = 3;
-//            Right = 4;
-//            ZoomIn = 5;
-//            ZoomOut = 6;
-//            PresetRecallOffset = 10;
-//            PresetSaveOffset = 30;
-//            NumberOfPresets = 5;
-//            // Analog
-//        }
+                viscaCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+                for (int i = 0; i < joinMap.NumberOfPresets; i++)
+                {
+                    int tempNum = i;
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallOffset + tempNum), () =>
+                        {
+                            viscaCamera.RecallPreset(tempNum);
+                        });
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveOffset + tempNum), () =>
+                    {
+                        viscaCamera.SavePreset(tempNum);
+                    });
+                }
+            }
+        }
+    }
 
-//        public override void OffsetJoinNumbers(uint joinStart)
-//        {
-//            var joinOffset = joinStart - 1;
-
-//            IsOnline = IsOnline + joinOffset;
-//            PowerOff = PowerOff + joinOffset;
-//            PowerOn = PowerOn + joinOffset;
-//            Up = Up + joinOffset;
-//            Down = Down + joinOffset;
-//            Left = Left + joinOffset;
-//            Right = Right + joinOffset;
-//            ZoomIn = ZoomIn + joinOffset;
-//            ZoomOut = ZoomOut + joinOffset;
-//            PresetRecallOffset = PresetRecallOffset + joinOffset;
-//            PresetSaveOffset = PresetSaveOffset + joinOffset;
-//        }
-//    }
-//}
+}

PepperDashEssentials/Bridges/DigitalLoggerBridge.cs

@@ -1,77 +1,42 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro.DeviceSupport;
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
 
-//namespace PepperDash.Essentials.Bridges
-//{
-//    public static class DigitalLoggerApiExtensions
-//    {
-//        public static void LinkToApi(this DigitalLogger DigitalLogger, BasicTriList trilist, uint joinStart, string joinMapKey)
-//        {
-//            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DigitalLoggerJoinMap;
+using Newtonsoft.Json;
 
-//            if (joinMap == null)
-//                joinMap = new DigitalLoggerJoinMap();
+namespace PepperDash.Essentials.Bridges
+{
+    public static class DigitalLoggerApiExtensions
+    {
+        public static void LinkToApi(this DigitalLogger DigitalLogger, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DigitalLoggerJoinMap joinMap = new DigitalLoggerJoinMap();
 
-//            joinMap.OffsetJoinNumbers(joinStart);
-//            Debug.Console(1, DigitalLogger, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-//            for (uint i = 1; i <= DigitalLogger.CircuitCount; i++)
-//            {
-//                var circuit = i;
-//                DigitalLogger.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
-//                DigitalLogger.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
-//                DigitalLogger.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
-//                trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => DigitalLogger.CycleCircuit(circuit - 1));
-//                trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => DigitalLogger.TurnOnCircuit(circuit - 1));
-//                trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => DigitalLogger.TurnOffCircuit(circuit - 1));
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
-//            }
-//        }
-//    }
-//    public class DigitalLoggerJoinMap : JoinMapBase
-//    {
-//        public uint IsOnline { get; set; }
-//        public uint CircuitNames { get; set; }
-//        public uint CircuitState { get; set; }
-//        public uint CircuitCycle { get; set; }
-//        public uint CircuitIsCritical { get; set; }
-//        public uint CircuitOnCmd { get; set; }
-//        public uint CircuitOffCmd { get; set; }
-//        public DigitalLoggerJoinMap()
-//        {
-//            // Digital
-//            IsOnline = 9;
-//            CircuitState = 0;
-//            CircuitCycle = 0;
-//            CircuitIsCritical = 10;
-//            CircuitOnCmd = 10;
-//            CircuitOffCmd = 20;
-//            // Serial
-//            CircuitNames = 0;
-//            // Analog
-//        }
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DigitalLoggerJoinMap>(joinMapSerialized);
 
-//        public override void OffsetJoinNumbers(uint joinStart)
-//        {
-//            var joinOffset = joinStart - 1;
+            joinMap.OffsetJoinNumbers(joinStart);
 
-//            IsOnline = IsOnline + joinOffset;
-//            CircuitNames = CircuitNames + joinOffset;
-//            CircuitState = CircuitState + joinOffset;
-//            CircuitCycle = CircuitCycle + joinOffset;
-//            CircuitIsCritical = CircuitIsCritical + joinOffset;
-//            CircuitOnCmd = CircuitOnCmd + joinOffset;
-//            CircuitOffCmd = CircuitOffCmd + joinOffset;
+            Debug.Console(1, DigitalLogger, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            for (uint i = 1; i <= DigitalLogger.CircuitCount; i++)
+            {
+                var circuit = i;
+                DigitalLogger.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
+                DigitalLogger.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
+                DigitalLogger.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
+                trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => DigitalLogger.CycleCircuit(circuit - 1));
+                trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => DigitalLogger.TurnOnCircuit(circuit - 1));
+                trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => DigitalLogger.TurnOffCircuit(circuit - 1));
 
-
-
-//        }
-//    }
-
-//}
+            }
+        }
+    }
+}

PepperDashEssentials/Bridges/DisplayControllerBridge.cs

@@ -1,171 +1,153 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro.DeviceSupport;
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
 
-//namespace PepperDash.Essentials.Bridges
-//{
-//    public static class DisplayControllerApiExtensions
-//    {
+using Newtonsoft.Json;
 
-//        public static BasicTriList _TriList;
-//        public static DisplayControllerJoinMap JoinMap;
-//        public static int InputNumber;
-//        public static IntFeedback InputNumberFeedback;
-//        public static List<string> InputKeys = new List<string>();
-//        public static void LinkToApi(this PepperDash.Essentials.Core.TwoWayDisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-//        {
-//            JoinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DisplayControllerJoinMap;
-//            _TriList = trilist;
 
-//            if (JoinMap == null)
-//            {
-//                JoinMap = new DisplayControllerJoinMap();
-//            }
+namespace PepperDash.Essentials.Bridges
+{
+	public static class DisplayControllerApiExtensions
+	{
+		public static void LinkToApi(this PepperDash.Essentials.Core.DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+		{
+            int inputNumber = 0;
+            IntFeedback inputNumberFeedback;
+            List<string> inputKeys = new List<string>();
+
+            DisplayControllerJoinMap joinMap = new DisplayControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            
+            if(!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DisplayControllerJoinMap>(joinMapSerialized);
+
+			joinMap.OffsetJoinNumbers(joinStart);
+
+			Debug.Console(1, "Linking to Trilist '{0}'",trilist.ID.ToString("X"));
+			Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
+
+            trilist.StringInput[joinMap.Name].StringValue = displayDevice.Name;			
+
+			var commMonitor = displayDevice as ICommunicationMonitor;
+            if (commMonitor != null)
+            {
+                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            }
+
+            inputNumberFeedback = new IntFeedback(() => { return inputNumber; });
+
+            // Two way feedbacks
+            var twoWayDisplay = displayDevice as PepperDash.Essentials.Core.TwoWayDisplayBase;
+            if (twoWayDisplay != null)
+            {
+                trilist.SetBool(joinMap.IsTwoWayDisplay, true);
+
+                twoWayDisplay.CurrentInputFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(CurrentInputFeedback_OutputChange);
+
+
+                inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect]);
+            }
+
+			// Power Off
+			trilist.SetSigTrueAction(joinMap.PowerOff, () =>
+				{
+					inputNumber = 102;
+					inputNumberFeedback.FireUpdate();
+					displayDevice.PowerOff();
+				});
+
+			displayDevice.PowerIsOnFeedback.OutputChange += new EventHandler<FeedbackEventArgs>( (o,a) => {
+                if (!a.BoolValue)
+                {
+                    inputNumber = 102;
+                    inputNumberFeedback.FireUpdate();
+
+                }
+                else
+                {
+                    inputNumber = 0;
+                    inputNumberFeedback.FireUpdate();
+                }
+            });
+
+			displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
+
+			// PowerOn
+			trilist.SetSigTrueAction(joinMap.PowerOn, () =>
+				{
+					inputNumber = 0;
+					inputNumberFeedback.FireUpdate();
+					displayDevice.PowerOn();
+				});
+
 			
-//            JoinMap.OffsetJoinNumbers(joinStart);
-//            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-//            Debug.Console(0, "Linking to Bridge Type {0}", displayDevice.GetType().Name.ToString());
+			displayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
 
-//            trilist.StringInput[JoinMap.Name].StringValue = displayDevice.GetType().Name.ToString();
+			int count = 1;
+			foreach (var input in displayDevice.InputPorts)
+			{
+				inputKeys.Add(input.Key.ToString());
+				var tempKey = inputKeys.ElementAt(count - 1);
+				trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset + count), () => { displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector); });
+                Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}", joinMap.InputSelectOffset + count, displayDevice.InputPorts[tempKey].Key.ToString());
+				trilist.StringInput[(ushort)(joinMap.InputNamesOffset + count)].StringValue = input.Key.ToString();
+				count++;
+			}
 
-//            InputNumberFeedback = new IntFeedback(() => { return InputNumber;});
-//            InputNumberFeedback.LinkInputSig(trilist.UShortInput[JoinMap.InputSelect]);
-//            var commMonitor = displayDevice as ICommunicationMonitor;
-//            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
-			
-//            // Poewer Off
-//            trilist.SetSigTrueAction(JoinMap.PowerOff, () => 
-//                {
-//                    InputNumber = 102;
-//                    InputNumberFeedback.FireUpdate();
-//                    displayDevice.PowerOff();
-//                });
+            Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
+			trilist.SetUShortSigAction(joinMap.InputSelect, (a) =>
+			{
+				if (a == 0)
+				{
+					displayDevice.PowerOff();
+					inputNumber = 0;
+				}
+				else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
+				{
+					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
+					inputNumber = a;
+				}
+				else if (a == 102)
+				{
+					displayDevice.PowerToggle();
 
-//            displayDevice.PowerIsOnFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(PowerIsOnFeedback_OutputChange);
-//            displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[JoinMap.PowerOff]);
-
-//            // Poewer On
-//            trilist.SetSigTrueAction(JoinMap.PowerOn, () => 
-//                {
-//                    InputNumber = 0;
-//                    InputNumberFeedback.FireUpdate();
-//                    displayDevice.PowerOn();
-//                }); 
+				}
+                if (twoWayDisplay != null)
+				    inputNumberFeedback.FireUpdate();
+			});
 
 
-//            displayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.PowerOn]);
-			
-//            int count = 1;
-//            foreach (var input in displayDevice.InputPorts)
-//            {
-//                InputKeys.Add(input.Key.ToString());
-//                var tempKey = InputKeys.ElementAt(count - 1);
-//                trilist.SetSigTrueAction((ushort)(JoinMap.InputSelectOffset + count), () => { displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector); }); 
-//                trilist.StringInput[(ushort)(JoinMap.InputNamesOffset + count)].StringValue = input.Key.ToString();
-//                count++;
-//            }
+            var volumeDisplay = displayDevice as IBasicVolumeControls;
+            if (volumeDisplay != null)
+            {
+                trilist.SetBoolSigAction(joinMap.VolumeUp, (b) => volumeDisplay.VolumeUp(b));
+                trilist.SetBoolSigAction(joinMap.VolumeDown, (b) => volumeDisplay.VolumeDown(b));
+                trilist.SetSigTrueAction(joinMap.VolumeMute, () => volumeDisplay.MuteToggle());
 
-//            displayDevice.CurrentInputFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(CurrentInputFeedback_OutputChange);
-//            trilist.SetUShortSigAction(JoinMap.InputSelect, (a) =>
-//            {
-//                if (a == 0)
-//                {
-//                    displayDevice.PowerOff();
-//                    InputNumber = 0;
-//                }
-//                else if (a > 0 && a < displayDevice.InputPorts.Count && a != InputNumber)
-//                {
-//                    displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
-//                    InputNumber = a;
-//                }
-//                else if (a == 102)
-//                {
-//                    displayDevice.PowerToggle();
-					
-//                }
-//                InputNumberFeedback.FireUpdate();
-//            });
-	
-//        }
+                var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
+                if(volumeDisplayWithFeedback != null)
+                {
+                    trilist.SetUShortSigAction(joinMap.VolumeLevel, new Action<ushort>((u) => volumeDisplayWithFeedback.SetVolume(u)));
+                    volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel]);
+                    volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute]);
+                }
+            }
+		}
 
-//        static void CurrentInputFeedback_OutputChange(object sender, FeedbackEventArgs e)
-//        {
+		static void CurrentInputFeedback_OutputChange(object sender, FeedbackEventArgs e)
+		{
 
-//            Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", e.StringValue);
+			Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", e.StringValue);
 
-//        }
+		}
 
-//        static void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
-//        {
-
-//            // Debug.Console(0, "PowerIsOnFeedback_OutputChange {0}",  e.BoolValue);
-//            if (!e.BoolValue)
-//            {
-//                InputNumber = 102;
-//                InputNumberFeedback.FireUpdate();
-
-//            }
-//            else
-//            {
-//                InputNumber = 0;
-//                InputNumberFeedback.FireUpdate();
-//            }
-//        }
-
-
-
-
-//    }
-//    public class DisplayControllerJoinMap : JoinMapBase
-//    {
-//        public uint Name { get; set; }
-//        public uint InputNamesOffset { get; set; }
-//        public uint InputSelectOffset { get; set; } 
-//        public uint IsOnline { get; set; }
-//        public uint PowerOff { get; set; }
-//        public uint InputSelect { get; set; }
-//        public uint PowerOn { get; set; }
-//        public uint SelectScene { get; set; }
-//        public uint LightingSceneOffset { get; set; }
-//        public uint ButtonVisibilityOffset { get; set; }
-//        public uint IntegrationIdSet { get; set; }
-
-//        public DisplayControllerJoinMap()
-//        {
-//            // Digital
-//            IsOnline = 50;
-//            PowerOff = 1;
-//            PowerOn = 2;
-//            InputSelect = 4;
-//            IntegrationIdSet = 1;
-//            LightingSceneOffset = 10;
-//            ButtonVisibilityOffset = 40;
-//            Name = 1;
-//            InputNamesOffset = 10;
-//            InputSelectOffset = 4;
-//            // Analog
-//        }
-
-//        public override void OffsetJoinNumbers(uint joinStart)
-//        {
-//            var joinOffset = joinStart - 1;
-
-//            IsOnline = IsOnline + joinOffset;
-//            PowerOff = PowerOff + joinOffset;
-//            PowerOn = PowerOn + joinOffset;
-//            SelectScene = SelectScene + joinOffset;
-//            LightingSceneOffset = LightingSceneOffset + joinOffset;
-//            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
-//            Name = Name + joinOffset;
-//            InputNamesOffset = InputNamesOffset + joinOffset;
-//            InputSelectOffset = InputSelectOffset + joinOffset;
-
-//        }
-//    }
-//}
+	}
+   
+}

PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs

@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges {
+    public static class DmBladeChassisControllerApiExtentions {
+        public static void LinkToApi(this DmBladeChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey) {
+            DmBladeChassisControllerJoinMap joinMap = new DmBladeChassisControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmBladeChassisControllerJoinMap>(joinMapSerialized);
+
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, dmChassis, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            var chassis = dmChassis.Chassis as BladeSwitch;
+
+            dmChassis.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+
+
+            // Link up outputs
+            for (uint i = 1; i <= dmChassis.Chassis.NumberOfOutputs; i++) {
+                var ioSlot = i;
+
+                // Control
+                trilist.SetUShortSigAction(joinMap.OutputVideo + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video)));
+
+                if (dmChassis.TxDictionary.ContainsKey(ioSlot)) {
+                    Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
+                    var txKey = dmChassis.TxDictionary[ioSlot];
+                    var basicTxDevice = DeviceManager.GetDeviceForKey(txKey) as BasicDmTxControllerBase;
+
+                    var advancedTxDevice = basicTxDevice as DmTxControllerBase;
+
+                    if (dmChassis.Chassis is DmMd128x128 || dmChassis.Chassis is DmMd64x64) {
+                        dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                    }
+                    else {
+                        if (advancedTxDevice != null) {
+                            advancedTxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                            Debug.Console(2, "Linking Tx Online Feedback from Advanced Transmitter at input {0}", ioSlot);
+                        }
+                        else if (dmChassis.InputEndpointOnlineFeedbacks[ioSlot] != null) {
+                            Debug.Console(2, "Linking Tx Online Feedback from Input Card {0}", ioSlot);
+                            dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                        }
+                    }
+
+                    if (basicTxDevice != null && advancedTxDevice == null)
+                        trilist.BooleanInput[joinMap.TxAdvancedIsPresent + ioSlot].BoolValue = true;
+
+                    if (advancedTxDevice != null) {
+                        advancedTxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+                    }
+                    else if (advancedTxDevice == null || basicTxDevice != null) {
+                        Debug.Console(1, "Setting up actions and feedbacks on input card {0}", ioSlot);
+                        dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                        var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
+                        if (inputPort != null) {
+                            Debug.Console(1, "Port value for input card {0} is set", ioSlot);
+                            var port = inputPort.Port;
+
+                            if (port != null) {
+                                if (port is HdmiInputWithCEC) {
+                                    Debug.Console(1, "Port is HdmiInputWithCec");
+
+                                    var hdmiInPortWCec = port as HdmiInputWithCEC;
+
+                                    if (hdmiInPortWCec.HdcpSupportedLevel != eHdcpSupportedLevel.Unknown) {
+                                        SetHdcpStateAction(true, hdmiInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                    }
+
+                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+
+                                    if (dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
+                                }
+                            }
+                        }
+                        else {
+                            inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--dmIn", ioSlot)];
+
+                            if (inputPort != null) {
+                                var port = inputPort.Port;
+
+                                if (port is DMInputPortWithCec) {
+                                    Debug.Console(1, "Port is DMInputPortWithCec");
+
+                                    var dmInPortWCec = port as DMInputPortWithCec;
+
+                                    if (dmInPortWCec != null) {
+                                        SetHdcpStateAction(dmChassis.PropertiesConfig.InputSlotSupportsHdcp2[ioSlot], dmInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                    }
+
+                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+
+                                    if (dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                    var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
+                    if (inputPort != null) {
+                        var hdmiPort = inputPort.Port as EndpointHdmiInput;
+
+                        if (hdmiPort != null) {
+                            SetHdcpStateAction(true, hdmiPort, joinMap.HdcpSupportState + ioSlot, trilist);
+                            dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+                        }
+                    }
+                }
+                if (dmChassis.RxDictionary.ContainsKey(ioSlot)) {
+                    Debug.Console(2, "Creating Rx Feedbacks {0}", ioSlot);
+                    //var rxKey = dmChassis.RxDictionary[ioSlot];
+                    //var rxDevice = DeviceManager.GetDeviceForKey(rxKey) as DmRmcControllerBase;
+                    //var hdBaseTDevice = DeviceManager.GetDeviceForKey(rxKey) as DmHdBaseTControllerBase;
+                    //if (hdBaseTDevice != null) {
+                        dmChassis.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+                    //}
+                    //else if (rxDevice != null) {
+                    //    rxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+                    //}
+                }
+
+                // Feedback
+                dmChassis.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
+
+
+                dmChassis.OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames + ioSlot]);
+                dmChassis.InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames + ioSlot]);
+                dmChassis.OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames + ioSlot]);
+            }
+        }
+
+        static void SetHdcpStateAction(bool hdcpTypeSimple, HdmiInputWithCEC port, uint join, BasicTriList trilist) {
+            if (hdcpTypeSimple) {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s => {
+                        if (s == 0) {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0) {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u => {
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+        static void SetHdcpStateAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist) {
+            if (hdcpTypeSimple) {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s => {
+                        if (s == 0) {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0) {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u => {
+                            port.HdcpCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+        static void SetHdcpStateAction(bool supportsHdcp2, DMInputPortWithCec port, uint join, BasicTriList trilist) {
+            if (!supportsHdcp2) {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s => {
+                        if (s == 0) {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0) {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u => {
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+    }
+}

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -1,130 +1,284 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public static class DmChassisControllerApiExtentions 
-    {
-        public static void LinkToApi(this DmChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmChassisControllerJoinMap;
-
-            if (joinMap == null)
-                joinMap = new DmChassisControllerJoinMap();
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, dmChassis, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            dmChassis.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-
-            // Link up outputs
-            for (uint i = 1; i <= dmChassis.Chassis.NumberOfOutputs - 1; i++)
-            {
-                var ioSlot = i;
-
-                // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video)));
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public static class DmChassisControllerApiExtentions
+    {
+        public static void LinkToApi(this DmChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmChassisControllerJoinMap joinMap = new DmChassisControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmChassisControllerJoinMap>(joinMapSerialized);
+            
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, dmChassis, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            var chassis = dmChassis.Chassis as DmMDMnxn;
+
+            dmChassis.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+
+            trilist.SetUShortSigAction(joinMap.SystemId, new Action<ushort>(o => chassis.SystemId.UShortValue = o));
+            trilist.SetSigTrueAction(joinMap.SystemId, new Action(() => chassis.ApplySystemId()));
+
+            dmChassis.SystemIdFeebdack.LinkInputSig(trilist.UShortInput[joinMap.SystemId]);
+            dmChassis.SystemIdBusyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SystemId]);
+
+            // Link up outputs
+            for (uint i = 1; i <= dmChassis.Chassis.NumberOfOutputs; i++)
+            {
+                var ioSlot = i;
+
+                // Control
+                trilist.SetUShortSigAction(joinMap.OutputVideo + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video)));
                 trilist.SetUShortSigAction(joinMap.OutputAudio + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio)));
-				if (dmChassis.TxDictionary.ContainsKey(ioSlot))
-				{
-					Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
-					var TxKey = dmChassis.TxDictionary[ioSlot];
-					var TxDevice = DeviceManager.GetDeviceForKey(TxKey) as DmTxControllerBase;
-					TxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
-					// TxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
-					// trilist.SetUShortSigAction((ApiMap.HdcpSupport[ioSlot]), u => TxDevice.SetHdcpSupportAll((ePdtHdcpSupport)(u)));
-					// TxDevice.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap. + ioSlot]);
-					// trilist.UShortInput[ApiMap.HdcpSupportCapability[ioSlot]].UShortValue = TxDevice.HdcpSupportCapability;
-				}
-				else
-				{
-					// dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[ApiMap.TxVideoSyncStatus[ioSlot]]);
-				}
-				if (dmChassis.RxDictionary.ContainsKey(ioSlot))
-				{
-					Debug.Console(2, "Creating Rx Feedbacks {0}", ioSlot);
-					var RxKey = dmChassis.RxDictionary[ioSlot];
-					var RxDevice = DeviceManager.GetDeviceForKey(RxKey) as DmRmcControllerBase;
-					RxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
-				}
-                // Feedback
-                dmChassis.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
-                dmChassis.AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio + ioSlot]);
-
-                 dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
-
-                dmChassis.OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames + ioSlot]);
-                dmChassis.InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames + ioSlot]);
-                dmChassis.OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames + ioSlot]);
-                dmChassis.OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames + ioSlot]);
-              //  dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
-               // dmChassis.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
-            }
-        }
-
-
-        public class DmChassisControllerJoinMap : JoinMapBase
-        {
-            public uint IsOnline { get; set; }
-            public uint OutputVideo { get; set; }
-            public uint OutputAudio { get; set; }
-            public uint VideoSyncStatus { get; set; }
-            public uint InputNames { get; set; }
-            public uint OutputNames { get; set; }
-            public uint OutputCurrentVideoInputNames { get; set; }
-            public uint OutputCurrentAudioInputNames { get; set; }
-            public uint InputCurrentResolution { get; set; }
-            public uint InputEndpointOnline { get; set; }
-            public uint OutputEndpointOnline { get; set; }
-            //public uint HdcpSupport { get; set; }
-            //public uint HdcpSupportCapability { get; set; }
-
-
-            public DmChassisControllerJoinMap()
-            {
-                IsOnline = 11;
-                OutputVideo = 100; //101-299
-                OutputAudio = 300; //301-499
-                VideoSyncStatus = 100; //101-299
-                InputNames = 100; //101-299
-                OutputNames = 300; //301-499
-                OutputCurrentVideoInputNames = 2000; //2001-2199
-                OutputCurrentAudioInputNames = 2200; //2201-2399
-                InputCurrentResolution = 2400; // 2401-2599
-                InputEndpointOnline = 500;
-                OutputEndpointOnline = 700;
-                //HdcpSupport = 1000; //1001-1199
-               //HdcpSupportCapability = 1200; //1201-1399
-
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                IsOnline = IsOnline + joinOffset;
-                OutputVideo = OutputVideo + joinOffset;
-                OutputAudio = OutputAudio + joinOffset;
-                VideoSyncStatus = VideoSyncStatus + joinOffset;
-                InputNames = InputNames + joinOffset;
-                OutputNames = OutputNames + joinOffset;
-                OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
-                OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset;
-                InputCurrentResolution = InputCurrentResolution + joinOffset;
-                InputEndpointOnline = InputEndpointOnline + joinOffset;
-                OutputEndpointOnline = OutputEndpointOnline + joinOffset;
-                //HdcpSupport = HdcpSupport + joinOffset;
-                //HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-            }
-        }
-    }
+                trilist.SetUShortSigAction(joinMap.OutputUsb + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbOutput)));
+                trilist.SetUShortSigAction(joinMap.InputUsb + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbInput)));
+
+                if (dmChassis.TxDictionary.ContainsKey(ioSlot))
+                {
+                    Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
+                    var txKey = dmChassis.TxDictionary[ioSlot];
+                    var basicTxDevice = DeviceManager.GetDeviceForKey(txKey) as BasicDmTxControllerBase;
+
+                    var advancedTxDevice = basicTxDevice as DmTxControllerBase;
+
+                    if (dmChassis.Chassis is DmMd8x8Cpu3 || dmChassis.Chassis is DmMd8x8Cpu3rps
+                        || dmChassis.Chassis is DmMd16x16Cpu3 || dmChassis.Chassis is DmMd16x16Cpu3rps
+                        || dmChassis.Chassis is DmMd32x32Cpu3 || dmChassis.Chassis is DmMd32x32Cpu3rps)
+                    {
+                        dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                    }
+                    else
+                    {
+                        if (advancedTxDevice != null)
+                        {
+                            advancedTxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                            Debug.Console(2, "Linking Tx Online Feedback from Advanced Transmitter at input {0}", ioSlot);
+                        }
+                        else if (dmChassis.InputEndpointOnlineFeedbacks[ioSlot] != null)
+                        {
+                            Debug.Console(2, "Linking Tx Online Feedback from Input Card {0}", ioSlot);
+                            dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);                           
+                        }
+                    }
+
+                    if (basicTxDevice != null && advancedTxDevice == null)
+                        trilist.BooleanInput[joinMap.TxAdvancedIsPresent + ioSlot].BoolValue = true;
+
+                    if (advancedTxDevice != null)
+                    {
+                        advancedTxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+                    }
+                    else if(advancedTxDevice == null || basicTxDevice != null)
+                    {
+                        Debug.Console(1, "Setting up actions and feedbacks on input card {0}", ioSlot);
+                        dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                        var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
+                        if (inputPort != null)
+                        {
+                            Debug.Console(1, "Port value for input card {0} is set", ioSlot);
+                            var port = inputPort.Port;
+
+                            if (port != null)
+                            {
+                                if (port is HdmiInputWithCEC)
+                                {
+                                    Debug.Console(1, "Port is HdmiInputWithCec");
+
+                                    var hdmiInPortWCec = port as HdmiInputWithCEC;
+
+                                    if (hdmiInPortWCec.HdcpSupportedLevel != eHdcpSupportedLevel.Unknown)
+                                    {
+                                        SetHdcpStateAction(true, hdmiInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                    }
+
+                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+
+                                    if(dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--dmIn", ioSlot)];
+
+                            if(inputPort != null)
+                            {
+                                var port = inputPort.Port;
+
+                                if (port is DMInputPortWithCec)
+                                {
+                                    Debug.Console(1, "Port is DMInputPortWithCec");
+
+                                    var dmInPortWCec = port as DMInputPortWithCec;
+
+                                    if (dmInPortWCec != null)
+                                    {
+                                        SetHdcpStateAction(dmChassis.PropertiesConfig.InputSlotSupportsHdcp2[ioSlot], dmInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                    }
+
+                                    dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+
+                                    if (dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                    var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
+                    if (inputPort != null)
+                    {
+                        var hdmiPort = inputPort.Port as EndpointHdmiInput;
+
+                        if (hdmiPort != null)
+                        {
+                            SetHdcpStateAction(true, hdmiPort, joinMap.HdcpSupportState + ioSlot, trilist);
+                            dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
+                        }
+                    }
+                }
+                if (dmChassis.RxDictionary.ContainsKey(ioSlot))
+                {
+                    Debug.Console(2, "Creating Rx Feedbacks {0}", ioSlot);
+                    var rxKey = dmChassis.RxDictionary[ioSlot];
+                    var rxDevice = DeviceManager.GetDeviceForKey(rxKey) as DmRmcControllerBase;
+                    var hdBaseTDevice = DeviceManager.GetDeviceForKey(rxKey) as DmHdBaseTControllerBase;
+                    if (dmChassis.Chassis is DmMd8x8Cpu3 || dmChassis.Chassis is DmMd8x8Cpu3rps
+                        || dmChassis.Chassis is DmMd16x16Cpu3 || dmChassis.Chassis is DmMd16x16Cpu3rps
+                        || dmChassis.Chassis is DmMd32x32Cpu3 || dmChassis.Chassis is DmMd32x32Cpu3rps || hdBaseTDevice != null)
+                    {
+                        dmChassis.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+                    }
+                    else if (rxDevice != null)
+                    {
+                        rxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+                    }          
+                }
+
+                // Feedback
+                dmChassis.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
+                dmChassis.AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio + ioSlot]);
+                dmChassis.UsbOutputRoutedToFeebacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputUsb + ioSlot]);
+                dmChassis.UsbInputRoutedToFeebacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.InputUsb + ioSlot]);
+
+
+                dmChassis.OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames + ioSlot]);
+                dmChassis.InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames + ioSlot]);
+                dmChassis.OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames + ioSlot]);
+                dmChassis.OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames + ioSlot]);
+            }
+        }
+
+        static void SetHdcpStateAction(bool hdcpTypeSimple, HdmiInputWithCEC port, uint join, BasicTriList trilist)
+        {
+            if (hdcpTypeSimple)
+            {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else
+            {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u =>
+                        {
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+        static void SetHdcpStateAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist)
+        {
+            if (hdcpTypeSimple)
+            {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else
+            {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u =>
+                        {
+                            port.HdcpCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+        static void SetHdcpStateAction(bool supportsHdcp2, DMInputPortWithCec port, uint join, BasicTriList trilist)
+        {
+            if (!supportsHdcp2)
+            {
+                trilist.SetUShortSigAction(join,
+                    new Action<ushort>(s =>
+                    {
+                        if (s == 0)
+                        {
+                            port.HdcpSupportOff();
+                        }
+                        else if (s > 0)
+                        {
+                            port.HdcpSupportOn();
+                        }
+                    }));
+            }
+            else
+            {
+                trilist.SetUShortSigAction(join,
+                        new Action<ushort>(u =>
+                        {
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
+                        }));
+            }
+        }
+
+    }
 }

PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

@@ -9,16 +9,20 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Bridges
 {
     public static class DmRmcControllerApiExtensions
     {
         public static void LinkToApi(this DmRmcControllerBase rmc, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmRmcControllerJoinMap;
+            DmRmcControllerJoinMap joinMap = new DmRmcControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new DmRmcControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmRmcControllerJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -36,40 +40,5 @@ namespace PepperDash.Essentials.Bridges
             if(rmc.EdidSerialNumberFeedback != null)
                 rmc.EdidSerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidSerialNumber]);
         }
-
-        public class DmRmcControllerJoinMap : JoinMapBase
-        {
-            public uint IsOnline { get; set; }
-            public uint CurrentOutputResolution { get; set; }
-            public uint EdidManufacturer { get; set; }
-            public uint EdidName { get; set; }
-            public uint EdidPrefferedTiming { get; set; }
-            public uint EdidSerialNumber { get; set; }
-
-            public DmRmcControllerJoinMap()
-            {
-                // Digital
-                IsOnline = 1;
-
-                // Serial
-                CurrentOutputResolution = 1;
-                EdidManufacturer = 2;
-                EdidName = 3;
-                EdidPrefferedTiming = 4;
-                EdidSerialNumber = 5;
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                IsOnline = IsOnline + joinOffset;
-                CurrentOutputResolution = CurrentOutputResolution + joinOffset;
-                EdidManufacturer = EdidManufacturer + joinOffset;
-                EdidName = EdidName + joinOffset;
-                EdidPrefferedTiming = EdidPrefferedTiming + joinOffset;
-                EdidSerialNumber = EdidSerialNumber + joinOffset;
-            }
-        }
     }
 }

PepperDashEssentials/Bridges/DmTxControllerBridge.cs

@@ -12,16 +12,20 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Bridges
 {
     public static class DmTxControllerApiExtensions
     {
         public static void LinkToApi(this DmTxControllerBase tx, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmTxControllerJoinMap;
+            DmTxControllerJoinMap joinMap = new DmTxControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new DmTxControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmTxControllerJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -30,7 +34,7 @@ namespace PepperDash.Essentials.Bridges
             tx.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
             tx.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus]);
             tx.AnyVideoInput.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentInputResolution]);
-            //tx.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportCapability]);
+            trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability;
 
             bool hdcpTypeSimple;
 
@@ -128,46 +132,6 @@ namespace PepperDash.Essentials.Bridges
             }
         }
 
-        public class DmTxControllerJoinMap : JoinMapBase
-        {
-            public uint IsOnline { get; set; }
-            public uint VideoSyncStatus { get; set; }
-            public uint CurrentInputResolution { get; set; }
-            public uint HdcpSupportCapability { get; set; }
-            public uint VideoInput { get; set; }
-            public uint AudioInput { get; set; }
-            public uint Port1HdcpState { get; set; }
-            public uint Port2HdcpState { get; set; }
 
-
-            public DmTxControllerJoinMap()
-            {
-                // Digital
-                IsOnline = 1;
-                VideoSyncStatus = 2;
-                // Serial
-                CurrentInputResolution = 1;
-                // Analog
-                VideoInput = 1;
-                AudioInput = 2;
-                HdcpSupportCapability = 3;
-                Port1HdcpState = 4;
-                Port2HdcpState = 5;
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                IsOnline = IsOnline + joinOffset;
-                VideoSyncStatus = VideoSyncStatus + joinOffset;
-                CurrentInputResolution = CurrentInputResolution + joinOffset;
-                VideoInput = VideoInput + joinOffset;
-                AudioInput = AudioInput + joinOffset;
-                HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-                Port1HdcpState = Port1HdcpState + joinOffset;
-                Port2HdcpState = Port2HdcpState + joinOffset;
-            }
-        }
     }
 }

PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public static class DmpsAudioOutputControllerApiExtensions
+    {
+        public static void LinkToApi(this DmpsAudioOutputController dmAudioOutputController, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmpsAudioOutputControllerJoinMap joinMap = new DmpsAudioOutputControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmpsAudioOutputControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, dmAudioOutputController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            if (dmAudioOutputController.MasterVolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.MasterVolumeLevel, joinMap.MasterVolume);
+            }
+
+            if (dmAudioOutputController.SourceVolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.SourceVolumeLevel, joinMap.SourceVolume);
+            }
+
+            if (dmAudioOutputController.Codec1VolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.Codec1VolumeLevel, joinMap.Codec1Volume);
+            }
+
+            if (dmAudioOutputController.Codec2VolumeLevel != null)
+            {
+                SetUpDmpsAudioOutputJoins(trilist, dmAudioOutputController.Codec2VolumeLevel, joinMap.Codec2Volume);
+            }
+
+        }
+
+        static void SetUpDmpsAudioOutputJoins(BasicTriList trilist, DmpsAudioOutput output, uint joinStart)
+        {
+            var volumeLevelJoin = joinStart;
+            var muteOnJoin = joinStart;
+            var muteOffJoin = joinStart + 1;
+            var volumeUpJoin = joinStart + 2;
+            var volumeDownJoin = joinStart + 3;
+
+
+            trilist.SetUShortSigAction(volumeLevelJoin, new Action<ushort>(o => output.SetVolume(o)));
+            output.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[volumeLevelJoin]);
+
+            trilist.SetSigTrueAction(muteOnJoin, new Action(output.MuteOn));
+            output.MuteFeedback.LinkInputSig(trilist.BooleanInput[muteOnJoin]);
+            trilist.SetSigTrueAction(muteOffJoin, new Action(output.MuteOff));
+            output.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[muteOffJoin]);
+
+            trilist.SetBoolSigAction(volumeUpJoin, new Action<bool>(b => output.VolumeUp(b)));
+            trilist.SetBoolSigAction(volumeDownJoin, new Action<bool>(b => output.VolumeDown(b)));
+        }
+    }
+}

PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public static class DmpsRoutingControllerApiExtentions 
+    {
+        public static void LinkToApi(this DmpsRoutingController dmpsRouter, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            DmpsRoutingControllerJoinMap joinMap = new DmpsRoutingControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, dmpsRouter, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            // Link up outputs
+            for (uint i = 1; i <= dmpsRouter.Dmps.NumberOfSwitcherInputs; i++)
+            {
+                Debug.Console(2, dmpsRouter, "Linking Input Card {0}", i);
+
+                var ioSlot = i;
+
+                //if (dmpsRouter.TxDictionary.ContainsKey(ioSlot))
+                //{
+                //    Debug.Console(2, "Creating Tx Feedbacks {0}", ioSlot);
+                //    var TxKey = dmpsRouter.TxDictionary[ioSlot];
+                //    var TxDevice = DeviceManager.GetDeviceForKey(TxKey) as DmTxControllerBase;
+                //    //TxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                //    // TxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                //    // trilist.SetUShortSigAction((ApiMap.HdcpSupport[ioSlot]), u => TxDevice.SetHdcpSupportAll((ePdtHdcpSupport)(u)));
+                //    // TxDevice.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap. + ioSlot]);
+                //    // trilist.UShortInput[ApiMap.HdcpSupportCapability[ioSlot]].UShortValue = TxDevice.HdcpSupportCapability;
+                //}
+                //else
+                //{
+                //    // dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[ApiMap.TxVideoSyncStatus[ioSlot]]);
+                //}
+                
+                if(dmpsRouter.VideoInputSyncFeedbacks[ioSlot] != null)
+                    dmpsRouter.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
+                if (dmpsRouter.InputNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames + ioSlot]);
+
+                trilist.SetStringSigAction(joinMap.InputNames + ioSlot, new Action<string>(s => 
+                    {
+                        var inputCard = dmpsRouter.Dmps.SwitcherInputs[ioSlot] as DMInput;
+
+                        if (inputCard != null)
+                        {
+                            if (inputCard.NameFeedback != null && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue) && inputCard.NameFeedback.StringValue != s)
+                                if(inputCard.Name != null)
+                                    inputCard.Name.StringValue = s;
+                        }
+                    }));
+
+
+                if(dmpsRouter.InputEndpointOnlineFeedbacks[ioSlot] != null)
+                    dmpsRouter.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+            }
+
+            for (uint i = 1; i <= dmpsRouter.Dmps.NumberOfSwitcherOutputs; i++)
+            {
+                Debug.Console(2, dmpsRouter, "Linking Output Card {0}", i);
+
+                var ioSlot = i;
+                // Control
+                trilist.SetUShortSigAction(joinMap.OutputVideo + ioSlot, new Action<ushort>(o => dmpsRouter.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video)));
+                trilist.SetUShortSigAction(joinMap.OutputAudio + ioSlot, new Action<ushort>(o => dmpsRouter.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio)));
+
+                trilist.SetStringSigAction(joinMap.OutputNames + ioSlot, new Action<string>(s =>
+                {
+                    var outputCard = dmpsRouter.Dmps.SwitcherOutputs[ioSlot] as DMOutput;
+
+                    //Debug.Console(2, dmpsRouter, "Output Name String Sig Action for Output Card  {0}", ioSlot);
+
+                    if (outputCard != null)
+                    {
+                        //Debug.Console(2, dmpsRouter, "Card Type: {0}", outputCard.CardInputOutputType);
+
+                        if (!(outputCard is Crestron.SimplSharpPro.DM.Cards.Card.Dmps3CodecOutput) && outputCard.NameFeedback != null)
+                        {
+                            if (!string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                            {
+                                //Debug.Console(2, dmpsRouter, "NameFeedabck: {0}", outputCard.NameFeedback.StringValue);
+
+                                if (outputCard.NameFeedback.StringValue != s && outputCard.Name != null)
+                                {
+                                    outputCard.Name.StringValue = s;
+                                }
+                            }
+                        }
+                    }
+                }));
+
+                // Feedback
+                if(dmpsRouter.VideoOutputFeedbacks[ioSlot] != null)
+                    dmpsRouter.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
+                if (dmpsRouter.AudioOutputFeedbacks[ioSlot] != null)
+                    dmpsRouter.AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio + ioSlot]);
+                if (dmpsRouter.OutputNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames + ioSlot]);
+                if (dmpsRouter.OutputVideoRouteNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames + ioSlot]);
+                if (dmpsRouter.OutputAudioRouteNameFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames + ioSlot]);
+                if (dmpsRouter.OutputEndpointOnlineFeedbacks[ioSlot] != null)
+                    dmpsRouter.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
+            }
+        }
+    }
+}

PepperDashEssentials/Bridges/GenericLightingBridge.cs

@@ -1,103 +1,74 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-//using Crestron.SimplSharpPro.DeviceSupport;
-//using PepperDash.Core;
-//using PepperDash.Essentials.Core;
-//using PepperDash.Essentials.Devices.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common;
 
-//namespace PepperDash.Essentials.Bridges
-//{
-//    public static class GenericLightingApiExtensions
-//    {
-//        public static void LinkToApi(this PepperDash.Essentials.Core.Lighting.LightingBase lightingDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-//        {
-//            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as GenericLightingJoinMap;
+using Newtonsoft.Json;
 
-//            if (joinMap == null)
-//                joinMap = new GenericLightingJoinMap();
+namespace PepperDash.Essentials.Bridges
+{
+    public static class GenericLightingApiExtensions
+    {
+        public static void LinkToApi(this PepperDash.Essentials.Core.Lighting.LightingBase lightingDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            GenericLightingJoinMap joinMap = new GenericLightingJoinMap();
 
-//            joinMap.OffsetJoinNumbers(joinStart);
-//            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+
+            // GenericLighitng Actions & FeedBack
+            trilist.SetUShortSigAction(joinMap.SelectScene, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+
+            int sceneIndex = 1;
+            foreach (var scene in lightingDevice.LightingScenes)
+            {
+                var tempIndex = sceneIndex - 1;
+                trilist.SetSigTrueAction((uint)(joinMap.LightingSceneOffset + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[tempIndex]));
+                scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)]);
+                trilist.StringInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)].StringValue = scene.Name;
+                trilist.BooleanInput[(uint)(joinMap.ButtonVisibilityOffset + sceneIndex)].BoolValue = true;
+                sceneIndex++;
+            }
+
+            if (lightingDevice.GetType().Name.ToString() == "LutronQuantumArea")
+            {
+                var lutronDevice = lightingDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
+                lutronDevice.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+                trilist.SetStringSigAction(joinMap.IntegrationIdSet, s => lutronDevice.IntegrationId = s);
+            }
+
+            //ApiEisc.Eisc.SetStringSigAction(ApiMap.integrationID, (s) => { lutronLights.IntegrationId = s; });
+
+
+            /*
+            var lutronLights = lightingDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
 
 			
+            for (uint i = 1; i <= lightingBase.CircuitCount; i++)
+            {
+                var circuit = i;
+                lightingBase.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
+                lightingBase.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
+                lightingBase.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
+                trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => lightingBase.CycleCircuit(circuit - 1));
+                trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => lightingBase.TurnOnCircuit(circuit - 1));
+                trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => lightingBase.TurnOffCircuit(circuit - 1));
 
-//            Debug.Console(0, "Linking to lighting Type {0}", lightingDevice.GetType().Name.ToString());
-			
-//            // GenericLighitng Actions & FeedBack
-//            trilist.SetUShortSigAction(joinMap.SelectScene, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
-			
-//            int sceneIndex = 1;
-//            foreach (var scene in lightingDevice.LightingScenes)
-//            {
-//                var tempIndex = sceneIndex - 1;
-//                trilist.SetSigTrueAction((uint)(joinMap.LightingSceneOffset + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[tempIndex]));
-//                scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)]);
-//                trilist.StringInput[(uint)(joinMap.LightingSceneOffset + sceneIndex)].StringValue = scene.Name;
-//                trilist.BooleanInput[(uint)(joinMap.ButtonVisibilityOffset + sceneIndex)].BoolValue = true;
-//                sceneIndex++;
-//            }
-
-//            if (lightingDevice.GetType().Name.ToString() == "LutronQuantumArea")
-//            {
-//                var lutronDevice = lightingDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
-//                lutronDevice.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-//                trilist.SetStringSigAction(joinMap.IntegrationIdSet, s => lutronDevice.IntegrationId = s);
-//            }
-
-//            //ApiEisc.Eisc.SetStringSigAction(ApiMap.integrationID, (s) => { lutronLights.IntegrationId = s; });
-
-
-//            /*
-//            var lutronLights = lightingDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
-
-			
-//            for (uint i = 1; i <= lightingBase.CircuitCount; i++)
-//            {
-//                var circuit = i;
-//                lightingBase.CircuitNameFeedbacks[circuit - 1].LinkInputSig(trilist.StringInput[joinMap.CircuitNames + circuit]);
-//                lightingBase.CircuitIsCritical[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitIsCritical + circuit]);
-//                lightingBase.CircuitState[circuit - 1].LinkInputSig(trilist.BooleanInput[joinMap.CircuitState + circuit]);
-//                trilist.SetSigTrueAction(joinMap.CircuitCycle + circuit, () => lightingBase.CycleCircuit(circuit - 1));
-//                trilist.SetSigTrueAction(joinMap.CircuitOnCmd + circuit, () => lightingBase.TurnOnCircuit(circuit - 1));
-//                trilist.SetSigTrueAction(joinMap.CircuitOffCmd + circuit, () => lightingBase.TurnOffCircuit(circuit - 1));
-
-//            }
-//             */ 
-//        }
-//    }
-//    public class GenericLightingJoinMap : JoinMapBase
-//    {
-//        public uint IsOnline { get; set; }
-//        public uint SelectScene { get; set; }
-//        public uint LightingSceneOffset { get; set; }
-//        public uint ButtonVisibilityOffset { get; set; }
-//        public uint IntegrationIdSet { get; set; }
-
-//        public GenericLightingJoinMap()
-//        {
-//            // Digital
-//            IsOnline = 1;
-//            SelectScene = 1;
-//            IntegrationIdSet = 1;
-//            LightingSceneOffset = 10;
-//            ButtonVisibilityOffset = 40;
-//            // Analog
-//        }
-
-//        public override void OffsetJoinNumbers(uint joinStart)
-//        {
-//            var joinOffset = joinStart - 1;
-
-//            IsOnline = IsOnline + joinOffset;
-//            SelectScene = SelectScene + joinOffset;
-//            LightingSceneOffset = LightingSceneOffset + joinOffset;
-//            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
-			
-
-
-//        }
-//    }
-//}
+            }
+             */
+        }
+    }
+}

PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

@@ -5,21 +5,24 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Bridges
 {
     public static class GenericRelayDeviceApiExtensions
     {
         public static void LinkToApi(this GenericRelayDevice relay, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as GenericRelayControllerJoinMap;
+            GenericRelayControllerJoinMap joinMap = new GenericRelayControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new GenericRelayControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -45,22 +48,4 @@ namespace PepperDash.Essentials.Bridges
         }
 
     }
-
-    public class GenericRelayControllerJoinMap : JoinMapBase
-    {
-        //Digital
-        public uint Relay { get; set; }
-
-        public GenericRelayControllerJoinMap()
-        {
-            Relay = 1;
-        }
-
-        public override void  OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            Relay = Relay + joinOffset;
-        }
-    }
 }

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Essentials.Devices.Common.Occupancy;
+
+using PepperDash.Essentials.Core;
+using PepperDash.Core;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public static class GlsOccupancySensorBaseControllerApiExtensions
+    {
+        public static void LinkToApi(this GlsOccupancySensorBaseController occController, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            GlsOccupancySensorBaseJoinMap joinMap = new GlsOccupancySensorBaseJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GlsOccupancySensorBaseJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, occController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            #region Single and Dual Sensor Stuff
+            occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+
+            // Occupied status
+            trilist.SetSigTrueAction(joinMap.ForceOccupied, new Action(() => occController.ForceOccupied()));
+            trilist.SetSigTrueAction(joinMap.ForceVacant, new Action(() => occController.ForceVacant()));
+            occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback]);
+            occController.RoomIsOccupiedFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.RoomVacantFeedback]);
+            occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback]);
+
+            // Timouts
+            trilist.SetUShortSigAction(joinMap.Timeout, new Action<ushort>((u) => occController.SetRemoteTimeout(u)));
+            occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout]);
+            occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback]);
+
+            // LED Flash
+            trilist.SetSigTrueAction(joinMap.EnableLedFlash, new Action(() => occController.SetLedFlashEnable(true)));
+            trilist.SetSigTrueAction(joinMap.DisableLedFlash, new Action(() => occController.SetLedFlashEnable(false)));
+            occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash]);
+
+            // Short Timeout
+            trilist.SetSigTrueAction(joinMap.EnableShortTimeout, new Action(() => occController.SetShortTimeoutState(true)));
+            trilist.SetSigTrueAction(joinMap.DisableShortTimeout, new Action(() => occController.SetShortTimeoutState(false)));
+            occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout]);
+
+            // PIR Sensor
+            trilist.SetSigTrueAction(joinMap.EnablePir, new Action(() => occController.SetPirEnable(true)));
+            trilist.SetSigTrueAction(joinMap.DisablePir, new Action(() => occController.SetPirEnable(false)));
+            occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir]);
+            
+            // PIR Sensitivity in Occupied State
+            trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState, new Action<bool>((b) => occController.IncrementPirSensitivityInOccupiedState(b)));
+            trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState, new Action<bool>((b) => occController.DecrementPirSensitivityInOccupiedState(b)));
+            occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInOccupiedState]);
+
+            // PIR Sensitivity in Vacant State
+            trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState, new Action<bool>((b) => occController.IncrementPirSensitivityInVacantState(b)));
+            trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState, new Action<bool>((b) => occController.DecrementPirSensitivityInVacantState(b)));
+            occController.PirSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInVacantState]);
+            #endregion
+
+            #region Dual Technology Sensor Stuff
+            var odtOccController = occController as GlsOdtOccupancySensorController;
+
+            if (odtOccController != null)
+            {
+                // OR When Vacated
+                trilist.SetBoolSigAction(joinMap.OrWhenVacated, new Action<bool>((b) => odtOccController.SetOrWhenVacatedState(b)));
+                odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated]);
+
+                // AND When Vacated
+                trilist.SetBoolSigAction(joinMap.AndWhenVacated, new Action<bool>((b) => odtOccController.SetAndWhenVacatedState(b)));
+                odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated]);
+
+                // Ultrasonic A Sensor
+                trilist.SetSigTrueAction(joinMap.EnableUsA, new Action(() => odtOccController.SetUsAEnable(true)));
+                trilist.SetSigTrueAction(joinMap.DisableUsA, new Action(() => odtOccController.SetUsAEnable(false)));
+                odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA]);
+
+                // Ultrasonic B Sensor
+                trilist.SetSigTrueAction(joinMap.EnableUsB, new Action(() => odtOccController.SetUsBEnable(true)));
+                trilist.SetSigTrueAction(joinMap.DisableUsB, new Action(() => odtOccController.SetUsBEnable(false)));
+                odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB]);
+
+                // US Sensitivity in Occupied State
+                trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState, new Action<bool>((b) => odtOccController.IncrementUsSensitivityInOccupiedState(b)));
+                trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState, new Action<bool>((b) => odtOccController.DecrementUsSensitivityInOccupiedState(b)));
+                odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInOccupiedState]);
+
+                // US Sensitivity in Vacant State
+                trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState, new Action<bool>((b) => odtOccController.IncrementUsSensitivityInVacantState(b)));
+                trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState, new Action<bool>((b) => odtOccController.DecrementUsSensitivityInVacantState(b)));
+                odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInVacantState]);
+
+            }
+            #endregion
+        }
+    }
+}

PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.DM;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public static class HdMdxxxCEControllerApiExtensions
+    {
+        public static void LinkToApi(this HdMdxxxCEController hdMdPair, BasicTriList trilist, uint joinStart, string joinMapKey)
+        {
+            HdMdxxxCEControllerJoinMap joinMap = new HdMdxxxCEControllerJoinMap();
+
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<HdMdxxxCEControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
+
+            Debug.Console(1, hdMdPair, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            hdMdPair.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+            hdMdPair.RemoteEndDetectedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RemoteEndDetected]);
+
+            trilist.SetSigTrueAction(joinMap.AutoRouteOn, new Action(() => hdMdPair.AutoRouteOn()));
+            hdMdPair.AutoRouteOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AutoRouteOn]);
+            trilist.SetSigTrueAction(joinMap.AutoRouteOff, new Action(() => hdMdPair.AutoRouteOff()));
+            hdMdPair.AutoRouteOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.AutoRouteOff]);
+
+            trilist.SetSigTrueAction(joinMap.PriorityRoutingOn, new Action(() => hdMdPair.PriorityRouteOn()));
+            hdMdPair.PriorityRoutingOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PriorityRoutingOn]);
+            trilist.SetSigTrueAction(joinMap.PriorityRoutingOff, new Action(() => hdMdPair.PriorityRouteOff()));
+            hdMdPair.PriorityRoutingOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PriorityRoutingOff]);
+
+            trilist.SetSigTrueAction(joinMap.InputOnScreenDisplayEnabled, new Action(() => hdMdPair.OnScreenDisplayEnable()));
+            hdMdPair.InputOnScreenDisplayEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputOnScreenDisplayEnabled]);
+            trilist.SetSigTrueAction(joinMap.AutoRouteOff, new Action(() => hdMdPair.OnScreenDisplayDisable()));
+            hdMdPair.InputOnScreenDisplayEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.InputOnScreenDisplayDisabled]);
+
+            trilist.SetUShortSigAction(joinMap.VideoSource, new Action<ushort>((i) => hdMdPair.ExecuteSwitch(i, null, eRoutingSignalType.Video | eRoutingSignalType.Audio)));
+            hdMdPair.VideoSourceFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoSource]);
+
+            trilist.UShortInput[joinMap.SourceCount].UShortValue = (ushort)hdMdPair.InputPorts.Count;
+
+            foreach (var input in hdMdPair.InputPorts)
+            {
+                var number = Convert.ToUInt16(input.Selector);
+                hdMdPair.SyncDetectedFeedbacks[number].LinkInputSig(trilist.BooleanInput[joinMap.SyncDetected + number]);
+                trilist.StringInput[joinMap.SourceNames + number].StringValue = input.Key;
+            }
+
+        } 
+    }
+}

PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs

@@ -8,17 +8,20 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Bridges
 {
     public static class IBasicCommunicationApiExtensions
     {
         public static void LinkToApi(this GenericComm comm, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as IBasicCommunicationJoinMap;
+            IBasicCommunicationJoinMap joinMap = new IBasicCommunicationJoinMap();
 
-            if (joinMap == null)
-                joinMap = new IBasicCommunicationJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);
             joinMap.OffsetJoinNumbers(joinStart);
 
             if (comm.CommPort == null)
@@ -30,14 +33,14 @@ namespace PepperDash.Essentials.Bridges
             Debug.Console(1, comm, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
             // this is a permanent event handler. This cannot be -= from event
-			comm.CommPort.TextReceived += (s, a) =>
-			{
-				Debug.Console(2, comm, "RX: {0}", a.Text);
-				trilist.SetString(joinMap.TextReceived, a.Text);
-			};
+            comm.CommPort.TextReceived += (s, a) =>
+            {
+                Debug.Console(2, comm, "RX: {0}", a.Text);
+                trilist.SetString(joinMap.TextReceived, a.Text);
+            };
             trilist.SetStringSigAction(joinMap.SendText, new Action<string>(s => comm.CommPort.SendText(s)));
-            trilist.SetStringSigAction(joinMap.SetPortConfig + 1, new Action<string>(s => comm.SetPortConfig(s)));
-        
+            trilist.SetStringSigAction(joinMap.SetPortConfig, new Action<string>(s => comm.SetPortConfig(s)));
+
 
             var sComm = comm.CommPort as ISocketStatus;
             if (sComm != null)
@@ -62,46 +65,5 @@ namespace PepperDash.Essentials.Bridges
                 }));
             }
         }
-
-
-
-        public class IBasicCommunicationJoinMap : JoinMapBase
-        {
-            //Digital
-            public uint Connect { get; set; }
-            public uint Connected { get; set; }
-
-            //Analog
-            public uint Status { get; set; }
-
-            // Serial
-            public uint TextReceived { get; set; }
-            public uint SendText { get; set; }
-            public uint SetPortConfig { get; set; }
-
-
-            public IBasicCommunicationJoinMap()
-            {
-                TextReceived = 1;
-                SendText = 1;
-                SetPortConfig = 2;
-                Connect = 1;
-                Connected = 1;
-                Status = 1;
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                TextReceived = TextReceived + joinOffset;
-                SendText = SendText + joinOffset;
-                SetPortConfig = SetPortConfig + joinOffset;
-                Connect = Connect + joinOffset;
-                Connected = Connected + joinOffset;
-                Status = Status + joinOffset;
-            }
-        }
     }
-
 }

PepperDashEssentials/Bridges/IBridge.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public interface IBridge
+    {
+        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
+    }
+}

PepperDashEssentials/Bridges/IDigitalInputBridge.cs

@@ -6,18 +6,23 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Bridges
 {
     public static class IDigitalInputApiExtenstions
     {
         public static void LinkToApi(this IDigitalInput input, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as IDigitalInputApiJoinMap;
+            IDigitalInputJoinMap joinMap = new IDigitalInputJoinMap();
 
-            if (joinMap == null)
-                joinMap = new IDigitalInputApiJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -35,25 +40,5 @@ namespace PepperDash.Essentials.Bridges
                 return;
             }
         }
-
-        
-    }
-
-    public class IDigitalInputApiJoinMap : JoinMapBase
-    {
-        //Digital
-        public uint InputState { get; set; }
-
-        public IDigitalInputApiJoinMap()
-        {
-            InputState = 1;
-        }
-
-        public override void  OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            InputState = InputState + joinOffset;
-        }
-    }
+    } 
 }

PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class AirMediaControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Indicates that the device is online when high
+        /// </summary>
+        public uint IsOnline { get; set; }
+        /// <summary>
+        /// Indicates that the device is in session when high
+        /// </summary>
+        public uint IsInSession { get; set; }
+        /// <summary>
+        /// Indicates sync detected on HDMI input when high
+        /// </summary>
+        public uint HdmiVideoSync { get; set; }
+        /// <summary>
+        /// Set High to enable automatic input routing and low to disable.  Feedback high when enabled
+        /// </summary>
+        public uint AutomaticInputRoutingEnabled { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Selects source and provides feedback
+        /// </summary>
+        public uint VideoOut { get; set; }
+        /// <summary>
+        /// Provided error feedback
+        /// </summary>
+        public uint ErrorFB { get; set; }
+        /// <summary>
+        /// Indicates the number of connected users as feedback
+        /// </summary>
+        public uint NumberOfUsersConnectedFB { get; set; }
+        /// <summary>
+        /// Sets the login code and provides the current code as feedback
+        /// </summary>
+        public uint LoginCode { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Provides the name defined in config as feedback
+        /// </summary>
+        public uint Name { get; set; }
+        /// <summary>
+        /// Provides the connection address as feedback
+        /// </summary>
+        public uint ConnectionAddressFB { get; set; }
+        /// <summary>
+        /// Provides the hostname as feedback
+        /// </summary>
+        public uint HostnameFB { get; set; }
+        /// <summary>
+        /// Provides the serial number as feedback
+        /// </summary>
+        public uint SerialNumberFeedback { get; set; }
+        #endregion
+
+        public AirMediaControllerJoinMap()
+        {
+            // Digital
+            IsOnline = 1;
+            IsInSession = 2;
+            HdmiVideoSync = 3;
+            AutomaticInputRoutingEnabled = 4;
+
+            // Analog
+            VideoOut = 1;
+            ErrorFB = 2;
+            NumberOfUsersConnectedFB = 3;
+            LoginCode = 4;
+
+            // Serial
+            Name = 1;
+            ConnectionAddressFB = 2;
+            HostnameFB = 3;
+            SerialNumberFeedback = 4;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            IsInSession = IsInSession + joinOffset;
+            HdmiVideoSync = HdmiVideoSync + joinOffset;
+            AutomaticInputRoutingEnabled = AutomaticInputRoutingEnabled + joinOffset;
+
+            VideoOut = VideoOut + joinOffset;
+            ErrorFB = ErrorFB + joinOffset;
+            NumberOfUsersConnectedFB = NumberOfUsersConnectedFB + joinOffset;
+            LoginCode = LoginCode + joinOffset;
+
+            Name = Name + joinOffset;
+            ConnectionAddressFB = ConnectionAddressFB + joinOffset;
+            HostnameFB = HostnameFB + joinOffset;
+            SerialNumberFeedback = SerialNumberFeedback + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class AppleTvJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Sends up arrow command while high
+        /// </summary>
+        public uint UpArrow { get; set; }
+        /// <summary>
+        /// Sends down arrow command while high
+        /// </summary>
+        public uint DnArrow { get; set; }
+        /// <summary>
+        /// Sends left arrow command while high
+        /// </summary>
+        public uint LeftArrow { get; set; }
+        /// <summary>
+        /// Sends right arrow command while high
+        /// </summary>
+        public uint RightArrow { get; set; }
+        /// <summary>
+        /// Sends menu command
+        /// </summary>
+        public uint Menu { get; set; }
+        /// <summary>
+        /// Sends select command
+        /// </summary>
+        public uint Select { get; set; }
+        /// <summary>
+        /// Sends play/pause command
+        /// </summary>
+        public uint PlayPause { get; set; }
+        #endregion
+
+        public AppleTvJoinMap()
+        {
+            UpArrow = 1;
+            DnArrow = 2;
+            LeftArrow = 3;
+            RightArrow = 4;
+            Menu = 5;
+            Select = 6;
+            PlayPause = 7;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            UpArrow = UpArrow + joinOffset;
+            DnArrow = DnArrow + joinOffset;
+            LeftArrow = LeftArrow + joinOffset;
+            RightArrow = RightArrow + joinOffset;
+            Menu = Menu + joinOffset;
+            Select = Select + joinOffset;
+            PlayPause = PlayPause + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class CameraControllerJoinMap : JoinMapBase
+    {
+        public uint IsOnline { get; set; }
+        public uint PowerOff { get; set; }
+        public uint PowerOn { get; set; }
+        public uint Up { get; set; }
+        public uint Down { get; set; }
+        public uint Left { get; set; }
+        public uint Right { get; set; }
+        public uint ZoomIn { get; set; }
+        public uint ZoomOut { get; set; }
+        public uint PresetRecallOffset { get; set; }
+        public uint PresetSaveOffset { get; set; }
+        public uint NumberOfPresets { get; set; }
+
+        public CameraControllerJoinMap()
+        {
+            // Digital
+            IsOnline = 9;
+            PowerOff = 8;
+            PowerOn = 7;
+            Up = 1;
+            Down = 2;
+            Left = 3;
+            Right = 4;
+            ZoomIn = 5;
+            ZoomOut = 6;
+            PresetRecallOffset = 10;
+            PresetSaveOffset = 30;
+            NumberOfPresets = 5;
+            // Analog
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            PowerOff = PowerOff + joinOffset;
+            PowerOn = PowerOn + joinOffset;
+            Up = Up + joinOffset;
+            Down = Down + joinOffset;
+            Left = Left + joinOffset;
+            Right = Right + joinOffset;
+            ZoomIn = ZoomIn + joinOffset;
+            ZoomOut = ZoomOut + joinOffset;
+            PresetRecallOffset = PresetRecallOffset + joinOffset;
+            PresetSaveOffset = PresetSaveOffset + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class DigitalLoggerJoinMap : JoinMapBase
+    {
+        public uint IsOnline { get; set; }
+        public uint CircuitNames { get; set; }
+        public uint CircuitState { get; set; }
+        public uint CircuitCycle { get; set; }
+        public uint CircuitIsCritical { get; set; }
+        public uint CircuitOnCmd { get; set; }
+        public uint CircuitOffCmd { get; set; }
+
+        public DigitalLoggerJoinMap()
+        {
+            // Digital
+            IsOnline = 9;
+            CircuitState = 0;
+            CircuitCycle = 0;
+            CircuitIsCritical = 10;
+            CircuitOnCmd = 10;
+            CircuitOffCmd = 20;
+            // Serial
+            CircuitNames = 0;
+            // Analog
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            CircuitNames = CircuitNames + joinOffset;
+            CircuitState = CircuitState + joinOffset;
+            CircuitCycle = CircuitCycle + joinOffset;
+            CircuitIsCritical = CircuitIsCritical + joinOffset;
+            CircuitOnCmd = CircuitOnCmd + joinOffset;
+            CircuitOffCmd = CircuitOffCmd + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs

@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class DisplayControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Turns the display off and reports power off feedback
+        /// </summary>
+        public uint PowerOff { get; set; }
+        /// <summary>
+        /// Turns the display on and repots power on feedback
+        /// </summary>
+        public uint PowerOn { get; set; }
+        /// <summary>
+        /// Indicates that the display device supports two way communication when high
+        /// </summary>
+        public uint IsTwoWayDisplay { get; set; }
+        /// <summary>
+        /// Increments the volume while high
+        /// </summary>
+        public uint VolumeUp { get; set; }
+        /// <summary>
+        /// Decrements teh volume while high
+        /// </summary>
+        public uint VolumeDown { get; set; }
+        /// <summary>
+        /// Toggles the mute state.  Feedback is high when volume is muted
+        /// </summary>
+        public uint VolumeMute { get; set; }
+        /// <summary>
+        /// Range of digital joins to select inputs and report current input as feedback
+        /// </summary>
+        public uint InputSelectOffset { get; set; }
+        /// <summary>
+        /// Range of digital joins to report visibility for input buttons
+        /// </summary>
+        public uint ButtonVisibilityOffset { get; set; }
+        /// <summary>
+        /// High if the device is online
+        /// </summary>
+        public uint IsOnline { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Analog join to set the input and report current input as feedback
+        /// </summary>
+        public uint InputSelect { get; set; }
+        /// <summary>
+        /// Sets the volume level and reports the current level as feedback 
+        /// </summary>
+        public uint VolumeLevel { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Reports the name of the display as defined in config as feedback
+        /// </summary>
+        public uint Name { get; set; }
+        /// <summary>
+        /// Range of serial joins that reports the names of the inputs as feedback
+        /// </summary>
+        public uint InputNamesOffset { get; set; }
+        #endregion
+
+        public DisplayControllerJoinMap()
+        {
+            // Digital
+            IsOnline = 50;
+            PowerOff = 1;
+            PowerOn = 2;
+            IsTwoWayDisplay = 3;
+            VolumeUp = 5;
+            VolumeDown = 6;
+            VolumeMute = 7;
+
+            ButtonVisibilityOffset = 40;
+            InputSelectOffset = 10;
+
+            // Analog
+            InputSelect = 11;
+            VolumeLevel = 5;
+
+            // Serial
+            Name = 1;
+            InputNamesOffset = 10;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            PowerOff = PowerOff + joinOffset;
+            PowerOn = PowerOn + joinOffset;
+            IsTwoWayDisplay = IsTwoWayDisplay + joinOffset;
+            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
+            Name = Name + joinOffset;
+            InputNamesOffset = InputNamesOffset + joinOffset;
+            InputSelectOffset = InputSelectOffset + joinOffset;
+
+            InputSelect = InputSelect + joinOffset;
+
+            VolumeUp = VolumeUp + joinOffset;
+            VolumeDown = VolumeDown + joinOffset;
+            VolumeMute = VolumeMute + joinOffset;
+            VolumeLevel = VolumeLevel + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges {
+    public class DmBladeChassisControllerJoinMap : JoinMapBase {
+        #region Digital/Analogs
+        #endregion
+
+        #region Digitals
+        /// <summary>
+        /// High when device is online
+        /// </summary>
+        public uint IsOnline { get; set; }
+        /// <summary>
+        /// Range reports video sync feedback for each input
+        /// </summary>
+        public uint VideoSyncStatus { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding input's endpoint is online
+        /// </summary>
+        public uint InputEndpointOnline { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding output's endpoint is online
+        /// </summary>
+        public uint OutputEndpointOnline { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding input's transmitter supports bridging as a separate device for detailed AV switching, HDCP control, etc.
+        /// </summary>
+        public uint TxAdvancedIsPresent { get; set; } // indicates that there is an attached transmitter that should be bridged to be interacted with
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Range sets and reports the current video source for the corresponding output
+        /// </summary>
+        public uint OutputVideo { get; set; }
+        /// <summary>
+        /// Range sets and reports the current HDCP state for the corresponding input card
+        /// </summary>
+        public uint HdcpSupportState { get; set; }
+        /// <summary>
+        /// Range reports the highest supported HDCP state level for the corresponding input card
+        /// </summary>
+        public uint HdcpSupportCapability { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Range sets and reports the name for the corresponding input card
+        /// </summary>
+        public uint InputNames { get; set; }
+        /// <summary>
+        /// Range sets and reports the name for the corresponding output card
+        /// </summary>
+        public uint OutputNames { get; set; }
+        /// <summary>
+        /// Range reports the name of the current video source for the corresponding output card
+        /// </summary>
+        public uint OutputCurrentVideoInputNames { get; set; }
+        /// <summary>
+        /// Range reports the current input resolution for each corresponding input card
+        /// </summary>
+        public uint InputCurrentResolution { get; set; }
+        #endregion
+
+        public DmBladeChassisControllerJoinMap() {
+            //Digital/Analog
+
+            //Digital 
+            IsOnline = 11;
+            VideoSyncStatus = 100; //101-299
+            InputEndpointOnline = 500; //501-699
+            OutputEndpointOnline = 700; //701-899
+            TxAdvancedIsPresent = 1000; //1001-1199
+
+            //Analog
+            OutputVideo = 100; //101-299
+            HdcpSupportState = 1000; //1001-1199
+            HdcpSupportCapability = 1200; //1201-1399
+
+
+            //Serial
+            InputNames = 100; //101-299
+            OutputNames = 300; //301-499
+            OutputCurrentVideoInputNames = 2000; //2001-2199
+            InputCurrentResolution = 2400; // 2401-2599
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart) {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            OutputVideo = OutputVideo + joinOffset;
+            VideoSyncStatus = VideoSyncStatus + joinOffset;
+            InputNames = InputNames + joinOffset;
+            OutputNames = OutputNames + joinOffset;
+            OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
+            InputCurrentResolution = InputCurrentResolution + joinOffset;
+            InputEndpointOnline = InputEndpointOnline + joinOffset;
+            OutputEndpointOnline = OutputEndpointOnline + joinOffset;
+            HdcpSupportState = HdcpSupportState + joinOffset;
+            HdcpSupportCapability = HdcpSupportCapability + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class DmChassisControllerJoinMap : JoinMapBase
+        {
+#region Digital/Analogs
+        /// <summary>
+        /// Analog input sets System ID, output reports current ID as feedback.
+        /// Digital input applies System ID, output is high when applying busy.
+        /// </summary>
+        public uint SystemId { get; set; }
+#endregion
+
+#region Digitals
+        /// <summary>
+        /// High when device is online
+        /// </summary>
+        public uint IsOnline { get; set; }
+        /// <summary>
+        /// Range reports video sync feedback for each input
+        /// </summary>
+        public uint VideoSyncStatus { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding input's endpoint is online
+        /// </summary>
+        public uint InputEndpointOnline { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding output's endpoint is online
+        /// </summary>
+        public uint OutputEndpointOnline { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding input's transmitter supports bridging as a separate device for detailed AV switching, HDCP control, etc.
+        /// </summary>
+        public uint TxAdvancedIsPresent { get; set; } // indicates that there is an attached transmitter that should be bridged to be interacted with
+#endregion
+
+#region Analogs
+        /// <summary>
+        /// Range sets and reports the current video source for the corresponding output
+        /// </summary>
+        public uint OutputVideo { get; set; }
+        /// <summary>
+        /// Range sets and reports the current audio source for the corresponding output
+        /// </summary>
+        public uint OutputAudio { get; set; }
+        /// <summary>
+        /// Range sets and reports the current Usb source for the corresponding output
+        /// </summary>
+        public uint OutputUsb { get; set; }
+        /// <summary>
+        /// Range sets and reports the current Usb source for the corresponding input
+        /// </summary>
+        public uint InputUsb { get; set; }
+        /// <summary>
+        /// Range sets and reports the current HDCP state for the corresponding input card
+        /// </summary>
+        public uint HdcpSupportState { get; set; }
+        /// <summary>
+        /// Range reports the highest supported HDCP state level for the corresponding input card
+        /// </summary>
+        public uint HdcpSupportCapability { get; set; }
+#endregion
+
+#region Serials
+        /// <summary>
+        /// Range sets and reports the name for the corresponding input card
+        /// </summary>
+        public uint InputNames { get; set; }
+        /// <summary>
+        /// Range sets and reports the name for the corresponding output card
+        /// </summary>
+        public uint OutputNames { get; set; }
+        /// <summary>
+        /// Range reports the name of the current video source for the corresponding output card
+        /// </summary>
+        public uint OutputCurrentVideoInputNames { get; set; }
+        /// <summary>
+        /// Range reports the name of the current audio source for the corresponding output card
+        /// </summary>
+        public uint OutputCurrentAudioInputNames { get; set; }
+        /// <summary>
+        /// Range reports the current input resolution for each corresponding input card
+        /// </summary>
+        public uint InputCurrentResolution { get; set; }
+#endregion
+
+        public DmChassisControllerJoinMap()
+        {
+            //Digital/Analog
+            SystemId = 10; // Analog sets/gets SystemId, digital input applies and provides feedback of ID change busy
+
+            //Digital 
+            IsOnline = 11;
+            VideoSyncStatus = 100; //101-299
+            InputEndpointOnline = 500; //501-699
+            OutputEndpointOnline = 700; //701-899
+            TxAdvancedIsPresent = 1000; //1001-1199
+
+            //Analog
+            OutputVideo = 100; //101-299
+            OutputAudio = 300; //301-499
+            OutputUsb = 500; //501-699
+            InputUsb = 700; //701-899
+            HdcpSupportState = 1000; //1001-1199
+            HdcpSupportCapability = 1200; //1201-1399
+
+
+            //Serial
+            InputNames = 100; //101-299
+            OutputNames = 300; //301-499
+            OutputCurrentVideoInputNames = 2000; //2001-2199
+            OutputCurrentAudioInputNames = 2200; //2201-2399
+            InputCurrentResolution = 2400; // 2401-2599
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            SystemId = SystemId + joinOffset;
+            IsOnline = IsOnline + joinOffset;
+            OutputVideo = OutputVideo + joinOffset;
+            OutputAudio = OutputAudio + joinOffset;
+            OutputUsb = OutputUsb + joinOffset;
+            InputUsb = InputUsb + joinOffset;
+            VideoSyncStatus = VideoSyncStatus + joinOffset;
+            InputNames = InputNames + joinOffset;
+            OutputNames = OutputNames + joinOffset;
+            OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
+            OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset;
+            InputCurrentResolution = InputCurrentResolution + joinOffset;
+            InputEndpointOnline = InputEndpointOnline + joinOffset;
+            OutputEndpointOnline = OutputEndpointOnline + joinOffset;
+            HdcpSupportState = HdcpSupportState + joinOffset;
+            HdcpSupportCapability = HdcpSupportCapability + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class DmRmcControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// High when device is online (if not attached to a DMP3 or DM chassis with a CPU3 card
+        /// </summary>
+        public uint IsOnline { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Reports the current output resolution
+        /// </summary>
+        public uint CurrentOutputResolution { get; set; }
+        /// <summary>
+        /// Reports the EDID manufacturer value
+        /// </summary>
+        public uint EdidManufacturer { get; set; }
+        /// <summary>
+        /// Reports the EDID Name value
+        /// </summary>
+        public uint EdidName { get; set; }
+        /// <summary>
+        /// Reports the EDID preffered timing value
+        /// </summary>
+        public uint EdidPrefferedTiming { get; set; }
+        /// <summary>
+        /// Reports the EDID serial number value
+        /// </summary>
+        public uint EdidSerialNumber { get; set; }
+        #endregion
+
+        public DmRmcControllerJoinMap()
+        {
+            // Digital
+            IsOnline = 1;
+
+            // Serial
+            CurrentOutputResolution = 1;
+            EdidManufacturer = 2;
+            EdidName = 3;
+            EdidPrefferedTiming = 4;
+            EdidSerialNumber = 5;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            CurrentOutputResolution = CurrentOutputResolution + joinOffset;
+            EdidManufacturer = EdidManufacturer + joinOffset;
+            EdidName = EdidName + joinOffset;
+            EdidPrefferedTiming = EdidPrefferedTiming + joinOffset;
+            EdidSerialNumber = EdidSerialNumber + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class DmTxControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// High when device is online (if not attached to a DMP3 or DM chassis with a CPU3 card
+        /// </summary>
+        public uint IsOnline { get; set; }
+        /// <summary>
+        /// High when video sync is detected
+        /// </summary>
+        public uint VideoSyncStatus { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Sets and reports the video source
+        /// </summary>
+        public uint VideoInput { get; set; }
+        /// <summary>
+        /// Sets and reports the audio source
+        /// </summary>
+        public uint AudioInput { get; set; }
+        /// <summary>
+        /// Reports the highest supported HDCP state level for the corresponding input card
+        /// </summary>
+        public uint HdcpSupportCapability { get; set; }
+        /// <summary>
+        /// Sets and reports the current HDCP state for the corresponding input port
+        /// </summary>
+        public uint Port1HdcpState { get; set; }
+        /// <summary>
+        /// Sets and reports the current HDCP state for the corresponding input port
+        /// </summary>
+        public uint Port2HdcpState { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Reports the current input resolution
+        /// </summary>
+        public uint CurrentInputResolution { get; set; }
+        #endregion
+
+
+        public DmTxControllerJoinMap()
+        {
+            // Digital
+            IsOnline = 1;
+            VideoSyncStatus = 2;
+            // Serial
+            CurrentInputResolution = 1;
+            // Analog
+            VideoInput = 1;
+            AudioInput = 2;
+            HdcpSupportCapability = 3;
+            Port1HdcpState = 4;
+            Port2HdcpState = 5;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            VideoSyncStatus = VideoSyncStatus + joinOffset;
+            CurrentInputResolution = CurrentInputResolution + joinOffset;
+            VideoInput = VideoInput + joinOffset;
+            AudioInput = AudioInput + joinOffset;
+            HdcpSupportCapability = HdcpSupportCapability + joinOffset;
+            Port1HdcpState = Port1HdcpState + joinOffset;
+            Port2HdcpState = Port2HdcpState + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class DmpsAudioOutputControllerJoinMap : JoinMapBase
+    {
+        #region Digital/Analog
+        /// <summary>
+        /// Range of joins for Master Volume 
+        /// Analog join 1 is volume level and feedback
+        /// Digital join 1 is Mute on and feedback
+        /// Digital join 2 is Mute off and feedback
+        /// Digital join 3 is volume up
+        /// Digital join 4 is volume down
+        /// </summary>
+        public uint MasterVolume { get; set; }
+        /// <summary>
+        /// Range of joins for Source Volume 
+        /// Analog join 11 is volume level and feedback
+        /// Digital join 11 is Mute on and feedback
+        /// Digital join 12 is Mute off and feedback
+        /// Digital join 13 is volume up
+        /// Digital join 14 is volume down
+        /// </summary>
+        public uint SourceVolume { get; set; }
+        /// <summary>
+        /// Range of joins for Codec1 Volume (if applicable)
+        /// Analog join 21 is volume level and feedback
+        /// Digital join 21 is Mute on and feedback
+        /// Digital join 22 is Mute off and feedback
+        /// Digital join 23 is volume up
+        /// Digital join 24 is volume down
+        /// </summary>
+        public uint Codec1Volume { get; set; }
+        /// <summary>
+        /// Range of joins for Codec2 Volume (if applicable)
+        /// Analog join 31 is volume level and feedback
+        /// Digital join 31 is Mute on and feedback
+        /// Digital join 32 is Mute off and feedback
+        /// Digital join 33 is volume up
+        /// Digital join 34 is volume down
+        /// </summary>
+        public uint Codec2Volume { get; set; }
+        #endregion
+
+        public DmpsAudioOutputControllerJoinMap()
+        {
+            MasterVolume = 1; // 1-10
+            SourceVolume = 11; // 11-20
+            Codec1Volume = 21; // 21-30
+            Codec2Volume = 31; // 31-40
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart;
+
+            MasterVolume = MasterVolume + joinOffset;
+            SourceVolume = SourceVolume + joinOffset;
+            Codec1Volume = Codec1Volume + joinOffset;
+            Codec2Volume = Codec2Volume + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class DmpsRoutingControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Range reports video sync feedback for each input
+        /// </summary>
+        public uint VideoSyncStatus { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding input's endpoint is online
+        /// </summary>
+        public uint InputEndpointOnline { get; set; }
+        /// <summary>
+        /// Range reports high if corresponding output's endpoint is online
+        /// </summary>
+        public uint OutputEndpointOnline { get; set; }       
+        #endregion
+
+
+        #region Analogs
+        /// <summary>
+        /// Range sets and reports the current video source for the corresponding output
+        /// </summary>
+        public uint OutputVideo { get; set; }
+        /// <summary>
+        /// Range sets and reports the current audio source for the corresponding output
+        /// </summary>
+        public uint OutputAudio { get; set; }
+        /// <summary>
+        /// Range sets and reports the current Usb source for the corresponding output
+        /// </summary>
+        //public uint OutputUsb { get; set; }
+        ///// <summary>
+        ///// Range sets and reports the current Usb source for the corresponding input
+        ///// </summary>
+        //public uint InputUsb { get; set; }
+        ///// <summary>
+        ///// Range sets and reports the current HDCP state for the corresponding input card
+        ///// </summary>
+        //public uint HdcpSupportState { get; set; }
+        ///// <summary>
+        ///// Range reports the highest supported HDCP state level for the corresponding input card
+        ///// </summary>
+        //public uint HdcpSupportCapability { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Range sets and reports the name for the corresponding input card
+        /// </summary>
+        public uint InputNames { get; set; }
+        /// <summary>
+        /// Range sets and reports the name for the corresponding output card
+        /// </summary>
+        public uint OutputNames { get; set; }
+        /// <summary>
+        /// Range reports the name of the current video source for the corresponding output card
+        /// </summary>
+        public uint OutputCurrentVideoInputNames { get; set; }
+        /// <summary>
+        /// Range reports the name of the current audio source for the corresponding output card
+        /// </summary>
+        public uint OutputCurrentAudioInputNames { get; set; }
+        /// <summary>
+        /// Range reports the current input resolution for each corresponding input card
+        /// </summary>
+        public uint InputCurrentResolution { get; set; }
+        #endregion
+
+
+        public DmpsRoutingControllerJoinMap()
+        {
+            //Digital 
+            VideoSyncStatus = 100; //101-299
+            InputEndpointOnline = 500; //501-699
+            OutputEndpointOnline = 700; //701-899
+
+            //Analog
+            OutputVideo = 100; //101-299
+            OutputAudio = 300; //301-499
+            //OutputUsb = 500; //501-699
+            //InputUsb = 700; //701-899
+            VideoSyncStatus = 100; //101-299
+            //HdcpSupportState = 1000; //1001-1199
+            //HdcpSupportCapability = 1200; //1201-1399
+
+
+            //Serial
+            InputNames = 100; //101-299
+            OutputNames = 300; //301-499
+            OutputCurrentVideoInputNames = 2000; //2001-2199
+            OutputCurrentAudioInputNames = 2200; //2201-2399
+            InputCurrentResolution = 2400; // 2401-2599
+            InputEndpointOnline = 500; //501-699
+            OutputEndpointOnline = 700; //701-899
+
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            OutputVideo = OutputVideo + joinOffset;
+            OutputAudio = OutputAudio + joinOffset;
+            //OutputUsb = OutputUsb + joinOffset;
+            //InputUsb = InputUsb + joinOffset;
+            VideoSyncStatus = VideoSyncStatus + joinOffset;
+            InputNames = InputNames + joinOffset;
+            OutputNames = OutputNames + joinOffset;
+            OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
+            OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset;
+            InputCurrentResolution = InputCurrentResolution + joinOffset;
+            InputEndpointOnline = InputEndpointOnline + joinOffset;
+            OutputEndpointOnline = OutputEndpointOnline + joinOffset;
+            //HdcpSupportState = HdcpSupportState + joinOffset;
+            //HdcpSupportCapability = HdcpSupportCapability + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
+
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class GenericLightingJoinMap : JoinMapBase
+    {
+        public uint IsOnline { get; set; }
+        public uint SelectScene { get; set; }
+        public uint LightingSceneOffset { get; set; }
+        public uint ButtonVisibilityOffset { get; set; }
+        public uint IntegrationIdSet { get; set; }
+
+        public GenericLightingJoinMap()
+        {
+            // Digital
+            IsOnline = 1;
+            SelectScene = 1;
+            IntegrationIdSet = 1;
+            LightingSceneOffset = 10;
+            ButtonVisibilityOffset = 40;
+            // Analog
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            SelectScene = SelectScene + joinOffset;
+            LightingSceneOffset = LightingSceneOffset + joinOffset;
+            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class GenericRelayControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Sets and reports the state of the relay (High = closed, Low = Open)
+        /// </summary>
+        public uint Relay { get; set; }
+        #endregion
+
+        public GenericRelayControllerJoinMap()
+        {
+            Relay = 1;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            Relay = Relay + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class GlsOccupancySensorBaseJoinMap : JoinMapBase
+    {
+        #region Digitals
+
+        /// <summary>
+        /// High when device is online
+        /// </summary>
+        public uint IsOnline { get; set; }
+        /// <summary>
+        /// Forces the device to report occupied status
+        /// </summary>
+        public uint ForceOccupied { get; set; }
+        /// <summary>
+        /// Forces the device to report vacant status
+        /// </summary>
+        public uint ForceVacant { get; set; }
+        /// <summary>
+        /// Enables raw status reporting
+        /// </summary>
+        public uint EnableRawStates { get; set; }
+        /// <summary>
+        /// High when raw occupancy is detected
+        /// </summary>
+        public uint RawOccupancyFeedback { get; set; }
+        /// <summary>
+        /// High when occupancy is detected
+        /// </summary>
+        public uint RoomOccupiedFeedback { get; set; }
+        /// <summary>
+        /// Hich when occupancy is detected in the grace period
+        /// </summary>
+        public uint GraceOccupancyDetectedFeedback { get; set; }
+        /// <summary>
+        /// High when vacancy is detected
+        /// </summary>
+        public uint RoomVacantFeedback { get; set; }
+
+        /// <summary>
+        /// Enables the LED Flash when set high
+        /// </summary>
+        public uint EnableLedFlash { get; set; }
+        /// <summary>
+        /// Disables the LED flash when set high
+        /// </summary>
+        public uint DisableLedFlash { get; set; }
+        /// <summary>
+        /// Enables the Short Timeout
+        /// </summary>
+        public uint EnableShortTimeout { get; set; }
+        /// <summary>
+        /// Disables the Short Timout
+        /// </summary>
+        public uint DisableShortTimeout { get; set; }
+        /// <summary>
+        /// Set high to enable one technology to trigger occupancy
+        /// </summary>
+        public uint OrWhenVacated { get; set; }
+        /// <summary>
+        /// Set high to require both technologies to trigger occupancy
+        /// </summary>
+        public uint AndWhenVacated { get; set; }
+        /// <summary>
+        /// Enables Ultrasonic Sensor A
+        /// </summary>
+        public uint EnableUsA { get; set; }
+        /// <summary>
+        /// Disables Ultrasonic Sensor A
+        /// </summary>
+        public uint DisableUsA { get; set; }
+        /// <summary>
+        /// Enables Ultrasonic Sensor B
+        /// </summary>
+        public uint EnableUsB { get; set; }
+        /// <summary>
+        /// Disables Ultrasonic Sensor B
+        /// </summary>
+        public uint DisableUsB { get; set; }
+        /// <summary>
+        /// Enables Pir
+        /// </summary>
+        public uint EnablePir { get; set; }
+        /// <summary>
+        /// Disables Pir
+        /// </summary>
+        public uint DisablePir { get; set; }
+        public uint IncrementUsInOccupiedState { get; set; }
+        public uint DecrementUsInOccupiedState { get; set; }
+        public uint IncrementUsInVacantState { get; set; }
+        public uint DecrementUsInVacantState { get; set; }
+        public uint IncrementPirInOccupiedState { get; set; }
+        public uint DecrementPirInOccupiedState { get; set; }
+        public uint IncrementPirInVacantState { get; set; }
+        public uint DecrementPirInVacantState { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Sets adn reports the remote timeout value
+        /// </summary>
+        public uint Timeout { get; set; }
+        /// <summary>
+        /// Reports the local timeout value
+        /// </summary>
+        public uint TimeoutLocalFeedback { get; set; }
+        /// <summary>
+        /// Sets the minimum internal photo sensor value and reports the current level
+        /// </summary>
+        public uint InternalPhotoSensorValue { get; set; }
+        /// <summary>
+        /// Sets the minimum external photo sensor value and reports the current level
+        /// </summary>
+        public uint ExternalPhotoSensorValue { get; set; }
+
+        public uint UsSensitivityInOccupiedState { get; set; }
+
+        public uint UsSensitivityInVacantState { get; set; }
+
+        public uint PirSensitivityInOccupiedState { get; set; }
+
+        public uint PirSensitivityInVacantState { get; set; }
+        #endregion
+
+        public GlsOccupancySensorBaseJoinMap()
+        {
+            IsOnline = 1;
+            ForceOccupied = 2;
+            ForceVacant = 3;
+            EnableRawStates = 4;
+            RoomOccupiedFeedback = 2;
+            GraceOccupancyDetectedFeedback = 3;
+            RoomVacantFeedback = 4;
+            RawOccupancyFeedback = 5;
+            EnableLedFlash = 11;
+            DisableLedFlash = 12;
+            EnableShortTimeout = 13;
+            DisableShortTimeout = 14;
+            OrWhenVacated = 15;
+            AndWhenVacated = 16;
+            EnableUsA = 17;
+            DisableUsA = 18;
+            EnableUsB = 19;
+            DisableUsB = 20;
+            EnablePir = 21;
+            DisablePir = 22;
+            DisablePir = 23;
+            IncrementUsInOccupiedState = 24;
+            DecrementUsInOccupiedState = 25;
+            IncrementUsInVacantState = 26;
+            DecrementUsInVacantState = 27;
+            IncrementPirInOccupiedState = 28;
+            DecrementPirInOccupiedState = 29;
+            IncrementPirInVacantState = 30;
+            DecrementPirInVacantState = 31;
+
+            Timeout = 1;
+            TimeoutLocalFeedback = 2;
+            InternalPhotoSensorValue = 3;
+            ExternalPhotoSensorValue = 4;
+            UsSensitivityInOccupiedState = 5;
+            UsSensitivityInVacantState = 6;
+            PirSensitivityInOccupiedState = 7;
+            PirSensitivityInVacantState = 8;           
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline =                          IsOnline + joinOffset; 
+            ForceOccupied =                     ForceOccupied + joinOffset; 
+            ForceVacant =                       ForceVacant + joinOffset; 
+            EnableRawStates =                   EnableRawStates + joinOffset; 
+            RoomOccupiedFeedback =              RoomOccupiedFeedback + joinOffset; 
+            GraceOccupancyDetectedFeedback =    GraceOccupancyDetectedFeedback + joinOffset;
+            RoomVacantFeedback =                RoomVacantFeedback + joinOffset; 
+            RawOccupancyFeedback =              RawOccupancyFeedback + joinOffset; 
+            EnableLedFlash =                    EnableLedFlash + joinOffset; 
+            DisableLedFlash =                   DisableLedFlash + joinOffset; 
+            EnableShortTimeout =                EnableShortTimeout + joinOffset; 
+            DisableShortTimeout =               DisableShortTimeout + joinOffset; 
+            OrWhenVacated =                     OrWhenVacated + joinOffset; 
+            AndWhenVacated =                    AndWhenVacated + joinOffset; 
+            EnableUsA =                         EnableUsA + joinOffset; 
+            DisableUsA =                        DisableUsA + joinOffset; 
+            EnableUsB =                         EnableUsB + joinOffset; 
+            DisableUsB =                        DisableUsB + joinOffset; 
+            EnablePir =                         EnablePir + joinOffset; 
+            DisablePir =                        DisablePir + joinOffset; 
+            DisablePir =                        DisablePir + joinOffset; 
+            IncrementUsInOccupiedState =        IncrementUsInOccupiedState + joinOffset; 
+            DecrementUsInOccupiedState =        DecrementUsInOccupiedState + joinOffset; 
+            IncrementUsInVacantState =          IncrementUsInVacantState + joinOffset; 
+            DecrementUsInVacantState =          DecrementUsInVacantState + joinOffset; 
+            IncrementPirInOccupiedState =       IncrementPirInOccupiedState + joinOffset;
+            DecrementPirInOccupiedState =       DecrementPirInOccupiedState + joinOffset;
+            IncrementPirInVacantState =         IncrementPirInVacantState + joinOffset; 
+            DecrementPirInVacantState =         DecrementPirInVacantState + joinOffset; 
+                                                
+            Timeout =                           Timeout + joinOffset; 
+            TimeoutLocalFeedback =              TimeoutLocalFeedback + joinOffset; 
+            InternalPhotoSensorValue =          InternalPhotoSensorValue + joinOffset; 
+            ExternalPhotoSensorValue =          ExternalPhotoSensorValue + joinOffset; 
+            UsSensitivityInOccupiedState =      UsSensitivityInOccupiedState + joinOffset;
+            UsSensitivityInVacantState =        UsSensitivityInVacantState + joinOffset; 
+            PirSensitivityInOccupiedState =     PirSensitivityInOccupiedState + joinOffset;
+            PirSensitivityInVacantState =       PirSensitivityInVacantState + joinOffset;
+        }
+    }    
+         
+}        

PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class HdMdxxxCEControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// High when the pair is online
+        /// </summary>
+        public uint IsOnline { get; set; }
+
+        /// <summary>
+        /// High when the remote end device is online
+        /// </summary>
+        public uint RemoteEndDetected { get; set; }
+
+        /// <summary>
+        /// Sets Auto Route On and provides feedback
+        /// </summary>
+        public uint AutoRouteOn { get; set; }
+
+        /// <summary>
+        /// Sets Auto Route Off and provides feedback
+        /// </summary>
+        public uint AutoRouteOff { get; set; }
+
+        /// <summary>
+        /// Sets Priority Routing On and provides feedback
+        /// </summary>
+        public uint PriorityRoutingOn { get; set; }
+
+        /// <summary>
+        /// Sets Priority Routing Off and provides feedback
+        /// </summary>
+        public uint PriorityRoutingOff { get; set; }
+
+        /// <summary>
+        /// Enables OSD and provides feedback
+        /// </summary>
+        public uint InputOnScreenDisplayEnabled { get; set; }
+
+        /// <summary>
+        /// Disables OSD and provides feedback
+        /// </summary>
+        public uint InputOnScreenDisplayDisabled { get; set; }
+
+        /// <summary>
+        /// Provides Video Sync Detected feedback for each input
+        /// </summary>
+        public uint SyncDetected { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Sets the video source for the receiver's HDMI out and provides feedback
+        /// </summary>
+        public uint VideoSource { get; set; }
+
+        /// <summary>
+        /// Indicates the number of sources supported by the Tx/Rx pair
+        /// </summary>
+        public uint SourceCount { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Indicates the name of each input port
+        /// </summary>
+        public uint SourceNames { get; set; }
+        #endregion
+
+        public HdMdxxxCEControllerJoinMap()
+        {
+            //Digital
+            IsOnline = 1;
+            RemoteEndDetected = 2;
+            AutoRouteOn = 3;
+            AutoRouteOff = 4;
+            PriorityRoutingOn = 5;
+            PriorityRoutingOff = 6;
+            InputOnScreenDisplayEnabled = 7;
+            InputOnScreenDisplayDisabled = 8;
+            SyncDetected = 10; // 11-15
+
+            //Analog
+            VideoSource = 1;
+            SourceCount = 2;
+
+            //Serials
+            SourceNames = 10; // 11-15
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            RemoteEndDetected = RemoteEndDetected + joinOffset;
+            AutoRouteOn = AutoRouteOn + joinOffset;
+            AutoRouteOff = AutoRouteOff + joinOffset;
+            PriorityRoutingOn = PriorityRoutingOn + joinOffset;
+            PriorityRoutingOff = PriorityRoutingOff + joinOffset;
+            InputOnScreenDisplayEnabled = InputOnScreenDisplayEnabled + joinOffset;
+            InputOnScreenDisplayDisabled = InputOnScreenDisplayDisabled + joinOffset;
+            SyncDetected = SyncDetected + joinOffset;
+
+            VideoSource = VideoSource + joinOffset;
+            SourceCount = SourceCount + joinOffset;
+
+            SourceNames = SourceNames + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class IBasicCommunicationJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Set High to connect, Low to disconnect
+        /// </summary>
+        public uint Connect { get; set; }
+        /// <summary>
+        /// Reports Connected State (High = Connected)
+        /// </summary>
+        public uint Connected { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Reports the connections status value
+        /// </summary>
+        public uint Status { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Data back from port
+        /// </summary>
+        public uint TextReceived { get; set; }
+        /// <summary>
+        /// Sends data to the port
+        /// </summary>
+        public uint SendText { get; set; }
+        /// <summary>
+        /// Takes a JSON serialized string that sets a COM port's parameters
+        /// </summary>
+        public uint SetPortConfig { get; set; }
+        #endregion
+
+        public IBasicCommunicationJoinMap()
+        {
+            TextReceived = 1;
+            SendText = 1;
+            SetPortConfig = 2;
+            Connect = 1;
+            Connected = 1;
+            Status = 1;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            TextReceived = TextReceived + joinOffset;
+            SendText = SendText + joinOffset;
+            SetPortConfig = SetPortConfig + joinOffset;
+            Connect = Connect + joinOffset;
+            Connected = Connected + joinOffset;
+            Status = Status + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class IDigitalInputJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Reports the state of the digital input
+        /// </summary>
+        public uint InputState { get; set; }
+        #endregion
+
+        public IDigitalInputJoinMap()
+        {
+            InputState = 1;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            InputState = InputState + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    public class SystemMonitorJoinMap : JoinMapBase
+    {
+        /// <summary>
+        /// Offset to indicate where the range of iterated program joins will start
+        /// </summary>
+        public uint ProgramStartJoin { get; set; }
+
+        /// <summary>
+        /// Offset between each program join set
+        /// </summary>
+        public uint ProgramOffsetJoin { get; set; }
+
+        #region Digitals
+        /// <summary>
+        /// Range Sets and reports whether the corresponding program slot is started
+        /// </summary>
+        public uint ProgramStart { get; set; }
+        /// <summary>
+        /// Range Sets and reports whether the corresponding program slot is stopped
+        /// </summary>
+        public uint ProgramStop { get; set; }
+        /// <summary>
+        /// Range Sets and reports whether the corresponding program is registered
+        /// </summary>
+        public uint ProgramRegister { get; set; }
+        /// <summary>
+        /// Range Sets and reports whether the corresponding program is unregistered
+        /// </summary>
+        public uint ProgramUnregister { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Sets and reports the time zone
+        /// </summary>
+        public uint TimeZone { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Reports the time zone name
+        /// </summary>
+        public uint TimeZoneName { get; set; }
+        /// <summary>
+        /// Reports the IO Controller Version
+        /// </summary>
+        public uint IOControllerVersion { get; set; }
+        /// <summary>
+        /// Reports the SNMP App Version
+        /// </summary>
+        public uint SnmpAppVersion { get; set; }
+        /// <summary>
+        /// Reports the BACnet App Version
+        /// </summary>
+        public uint BACnetAppVersion { get; set; }
+        /// <summary>
+        /// Reports the firmware version
+        /// </summary>
+        public uint ControllerVersion { get; set; }
+
+        /// <summary>
+        /// Reports the name of the corresponding program
+        /// </summary>
+        public uint ProgramName { get; set; }
+        /// <summary>
+        /// Reports the compile time of the corresponding program
+        /// </summary>
+        public uint ProgramCompiledTime { get; set; }
+        /// <summary>
+        /// Reports the Crestron Database version of the corresponding program
+        /// </summary>
+        public uint ProgramCrestronDatabaseVersion { get; set; }
+        /// <summary>
+        /// Reports the Environment Version of the corresponding program
+        /// </summary>
+        public uint ProgramEnvironmentVersion { get; set; }
+        /// <summary>
+        /// Serialized JSON output that aggregates the program info of the corresponding program
+        /// </summary>
+        public uint AggregatedProgramInfo { get; set; }
+        #endregion
+
+        public SystemMonitorJoinMap()
+        {
+            TimeZone = 1;
+
+            TimeZoneName = 1;
+            IOControllerVersion = 2;
+            SnmpAppVersion = 3;
+            BACnetAppVersion = 4;
+            ControllerVersion = 5;
+
+
+            ProgramStartJoin = 10;
+
+            ProgramOffsetJoin = 5;
+
+            // Offset in groups of 5 joins
+            ProgramStart = 1;
+            ProgramStop = 2;
+            ProgramRegister = 3;
+            ProgramUnregister = 4;
+
+            ProgramName = 1;
+            ProgramCompiledTime = 2;
+            ProgramCrestronDatabaseVersion = 3;
+            ProgramEnvironmentVersion = 4;
+            AggregatedProgramInfo = 5;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            TimeZone = TimeZone + joinOffset;
+
+            TimeZoneName = TimeZoneName + joinOffset;
+            IOControllerVersion = IOControllerVersion + joinOffset;
+            SnmpAppVersion = SnmpAppVersion + joinOffset;
+            BACnetAppVersion = BACnetAppVersion + joinOffset;
+            ControllerVersion = ControllerVersion + joinOffset;
+
+            // Sets the initial join value where the iterated program joins will begin
+            ProgramStartJoin = ProgramStartJoin + joinOffset;
+        }
+    }
+}

PepperDashEssentials/Bridges/SystemMonitorBridge.cs

@@ -9,20 +9,25 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Monitoring;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Bridges
 {
     public static class SystemMonitorBridge
     {
         public static void LinkToApi(this SystemMonitorController systemMonitorController, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as SystemMonitorJoinMap;
+            SystemMonitorJoinMap joinMap = new SystemMonitorJoinMap();
 
-            if (joinMap == null)
-                joinMap = new SystemMonitorJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if(!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<SystemMonitorJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
-            //Debug.Console(1, systemMonitorController, "Linking API starting at join: {0}", joinStart);
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(2, systemMonitorController, "Linking API starting at join: {0}", joinStart);
 
             systemMonitorController.TimeZoneFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeZone]);
             //trilist.SetUShortSigAction(joinMap.TimeZone, new Action<ushort>(u => systemMonitorController.SetTimeZone(u)));
@@ -33,18 +38,13 @@ namespace PepperDash.Essentials.Bridges
             systemMonitorController.BACnetAppVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.BACnetAppVersion]);
             systemMonitorController.ControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.ControllerVersion]);
 
-
             // iterate the program status feedback collection and map all the joins
             var programSlotJoinStart = joinMap.ProgramStartJoin;
 
             foreach (var p in systemMonitorController.ProgramStatusFeedbackCollection)
             {
-
-                // TODO: link feedbacks for each program slot
                 var programNumber = p.Value.Program.Number;
 
-                //Debug.Console(1, systemMonitorController, "Linking API for Program Slot: {0} starting at join: {1}", programNumber, programSlotJoinStart);
-
                 trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStart, new Action<bool>
                     (b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Start));
                 p.Value.ProgramStartedFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramStart]);
@@ -63,88 +63,6 @@ namespace PepperDash.Essentials.Bridges
 
                 programSlotJoinStart = programSlotJoinStart + joinMap.ProgramOffsetJoin;
             }
-
-        }
-
-
-    }
-
-    public class SystemMonitorJoinMap : JoinMapBase
-    {
-        /// <summary>
-        /// Offset to indicate where the range of iterated program joins will start
-        /// </summary>
-        public uint ProgramStartJoin { get; set; }
-
-        /// <summary>
-        /// Offset between each program join set
-        /// </summary>
-        public uint ProgramOffsetJoin { get; set; }
-
-        //Digital
-        public uint ProgramStart { get; set; }
-        public uint ProgramStop { get; set; }
-        public uint ProgramRegister { get; set; }
-        public uint ProgramUnregister { get; set; }
-
-        //Analog
-        public uint TimeZone { get; set; }
-
-        //Serial
-        public uint TimeZoneName { get; set; }
-        public uint IOControllerVersion { get; set; }
-        public uint SnmpAppVersion { get; set; }
-        public uint BACnetAppVersion { get; set; }
-        public uint ControllerVersion { get; set; }
-
-        public uint ProgramName { get; set; }
-        public uint ProgramCompiledTime { get; set; }
-        public uint ProgramCrestronDatabaseVersion { get; set; }
-        public uint ProgramEnvironmentVersion { get; set; }
-        public uint AggregatedProgramInfo { get; set; }
-
-        public SystemMonitorJoinMap()
-        {
-            TimeZone = 1;
-
-            TimeZoneName = 1;
-            IOControllerVersion = 2;
-            SnmpAppVersion = 3;
-            BACnetAppVersion = 4;
-            ControllerVersion = 5;
-
-            
-            ProgramStartJoin = 10;
-            
-            ProgramOffsetJoin = 5;
-
-            // Offset in groups of 5 joins
-            ProgramStart = 1;
-            ProgramStop = 2;
-            ProgramRegister = 3;
-            ProgramUnregister = 4;
-
-            ProgramName = 1;
-            ProgramCompiledTime = 2;
-            ProgramCrestronDatabaseVersion = 3;
-            ProgramEnvironmentVersion = 4;
-            AggregatedProgramInfo = 5;
-        }
-
-        public override void OffsetJoinNumbers(uint joinStart)
-        {
-            var joinOffset = joinStart - 1;
-
-            TimeZone = TimeZone + joinOffset;
-
-            TimeZoneName = TimeZoneName + joinOffset;
-            IOControllerVersion = IOControllerVersion + joinOffset;
-            SnmpAppVersion = SnmpAppVersion + joinOffset;
-            BACnetAppVersion = BACnetAppVersion + joinOffset;
-            ControllerVersion = ControllerVersion + joinOffset;
-
-            // Sets the initial join value where the iterated program joins will begin
-            ProgramStartJoin = ProgramStartJoin + joinOffset;
         }
     }
 }

PepperDashEssentials/ControlSystem.cs

@@ -15,39 +15,44 @@ using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.DM;
 using PepperDash.Essentials.Fusion;
 using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Room.Cotija;
+using PepperDash.Essentials.Room.MobileControl;
+
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials
 {
-	public class ControlSystem : CrestronControlSystem
-	{
+    public class ControlSystem : CrestronControlSystem
+    {
         HttpLogoServer LogoServer;
 
-		List<object> FactoryObjects = new List<object>();
+        List<object> FactoryObjects = new List<object>();
 
-		public ControlSystem()
-			: base()
-		{
-			Thread.MaxNumberOfUserThreads = 400;
-			Global.ControlSystem = this;
-			DeviceManager.Initialize(this);        
-		}
+        public ControlSystem()
+            : base()
+        {
+            Thread.MaxNumberOfUserThreads = 400;
+            Global.ControlSystem = this;
+            DeviceManager.Initialize(this);
+        }
 
-		/// <summary>
-		/// Git 'er goin'
-		/// </summary>
-		public override void InitializeSystem()
-		{
+        /// <summary>
+        /// Git 'er goin'
+        /// </summary>
+        public override void InitializeSystem()
+        {
             DeterminePlatform();
 
-            //CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
-            //    ConsoleAccessLevelEnum.AccessOperator);
+            if (Debug.DoNotLoadOnNextBoot)
+            {
+                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+                    ConsoleAccessLevelEnum.AccessOperator);
+            }
 
-           // CrestronConsole.AddNewConsoleCommand(S => { ConfigWriter.WriteConfigFile(null); }, "writeconfig", "writes the current config to a file", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Notice, "CONSOLE MESSAGE: {0}", s);
-			}, "appdebugmessage", "Writes message to log", ConsoleAccessLevelEnum.AccessOperator);
+            // CrestronConsole.AddNewConsoleCommand(S => { ConfigWriter.WriteConfigFile(null); }, "writeconfig", "writes the current config to a file", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s =>
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "CONSOLE MESSAGE: {0}", s);
+            }, "appdebugmessage", "Writes message to log", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
@@ -56,198 +61,245 @@ namespace PepperDash.Essentials
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
-			CrestronConsole.AddNewConsoleCommand(s =>
-			{
-				CrestronConsole.ConsoleCommandResponse
-					("Current running configuration. This is the merged system and template configuration");
-				CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
-					(ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
-			}, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s =>
+            {
+                CrestronConsole.ConsoleCommandResponse
+                    ("Current running configuration. This is the merged system and template configuration");
+                CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
+                    (ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
+            }, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
 
-			CrestronConsole.AddNewConsoleCommand(s =>
-				{
-					CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
-						"System URL:   {0}\r" +
-						"Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
-				}, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s =>
+                {
+                    CrestronConsole.ConsoleCommandResponse("This system can be found at the following URLs:\r" +
+                        "System URL:   {0}\r" +
+                        "Template URL: {1}", ConfigReader.ConfigObject.SystemUrl, ConfigReader.ConfigObject.TemplateUrl);
+                }, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
-            GoWithLoad();
-		}
+            if (!Debug.DoNotLoadOnNextBoot)
+                GoWithLoad();
+        }
 
         /// <summary>
-        /// Determines if the program is running on a processor (appliance) or server (XiO Edge).
+        /// Determines if the program is running on a processor (appliance) or server (VC-4).
         /// 
         /// Sets Global.FilePathPrefix based on platform
         /// </summary>
         public void DeterminePlatform()
         {
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Determining Platform....");
-
-            string filePathPrefix;
-
-            var dirSeparator = Global.DirectorySeparator;
-
-            var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-
-            var versionString = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
-
-            string directoryPrefix;
-
-            directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
-
-            if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows OS
+            try
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", versionString);
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Determining Platform....");
 
-                // Check if User/ProgramX exists
-                if(Directory.Exists(directoryPrefix + dirSeparator + "User" 
-                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
+                string filePathPrefix;
+
+                var dirSeparator = Global.DirectorySeparator;
+
+                var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+
+                var versionString = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
+
+                string directoryPrefix;
+
+                directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
+
+                if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows OS
                 {
-                    Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
-                    filePathPrefix = directoryPrefix + dirSeparator + "User" 
-                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", versionString);
+
+                    // Check if User/ProgramX exists
+                    if (Directory.Exists(directoryPrefix + dirSeparator + "User"
+                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
+                    {
+                        Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
+                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
+                    }
+                    // Check if Nvram/Programx exists
+                    else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram"
+                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
+                    {
+                        Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "Nvram"
+                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
+                    }
+                    // If neither exists, set path to User/ProgramX
+                    else
+                    {
+                        Debug.Console(0, @"No previous directory found.  Using User/program{0}", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
+                        + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
+                    }
                 }
-                // Check if Nvram/Programx exists
-                else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram"
-                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
+                else   // Handles Linux OS (Virtual Control)
                 {
-                    Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber);
-                    filePathPrefix = directoryPrefix + dirSeparator + "Nvram"
-                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
-                }
-                // If neither exists, set path to User/ProgramX
-                else
-                {
-                    Debug.Console(0, @"No previous directory found.  Using User/program{0}", InitialParametersClass.ApplicationNumber);
-                    filePathPrefix = directoryPrefix + dirSeparator + "User"
-                    + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on Virtual Control Server", versionString);
+
+                    // Set path to User/
+                    filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator;
                 }
+
+                Global.SetFilePathPrefix(filePathPrefix);
             }
-            else   // Handles Linux OS (Virtual Control)
+            catch (Exception e)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on Virtual Control Server", versionString);
-
-                // Set path to User/
-                filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator;
+                Debug.Console(0, "Unable to Determine Platform due to Exception: {0}", e.Message);
             }
-
-            Global.SetFilePathPrefix(filePathPrefix);
         }
 
-		/// <summary>
-		/// Do it, yo
-		/// </summary>
-		public void GoWithLoad()
-		{
-			try
-			{
+        /// <summary>
+        /// Do it, yo
+        /// </summary>
+        public void GoWithLoad()
+        {
+            try
+            {
+                Debug.SetDoNotLoadOnNextBoot(false);
+
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials load from configuration");
 
-				var filesReady = SetupFilesystem();
-				if (filesReady)
-				{
-					Debug.Console(0, Debug.ErrorLogLevel.Notice, "Checking for plugins");
-					LoadPlugins();
+                var filesReady = SetupFilesystem();
+                if (filesReady)
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Checking for plugins");
+                    LoadPlugins();
 
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
-					if (!ConfigReader.LoadConfig2())
-						return;
+                    if (!ConfigReader.LoadConfig2())
+                        return;
 
-					Load();
+                    Load();
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Essentials load complete\r" +
-						"-------------------------------------------------------------");
-				}
-				else
-				{
-					Debug.Console(0,
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"Essentials file structure setup completed.\r" +
-						"Please load config, sgd and ir files and\r" +
-						"restart program.\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------\r" +
-						"------------------------------------------------");
-				}
+                        "-------------------------------------------------------------");
+                }
+                else
+                {
+                    Debug.Console(0,
+                        "------------------------------------------------\r" +
+                        "------------------------------------------------\r" +
+                        "------------------------------------------------\r" +
+                        "Essentials file structure setup completed.\r" +
+                        "Please load config, sgd and ir files and\r" +
+                        "restart program.\r" +
+                        "------------------------------------------------\r" +
+                        "------------------------------------------------\r" +
+                        "------------------------------------------------");
+                }
 
             }
-			catch (Exception e)
-			{
-				Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r{0}", e);
+            catch (Exception e)
+            {
+                Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r{0}", e);
 
 
-			}
+            }
 
-            // Notify the 
+            // Notify the OS that the program intitialization has completed
             SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
 
-		}
+        }
 
-		/// <summary>
-		/// Initial simple implementation.  Reads user/programN/plugins folder and 
-		/// use
-		/// </summary>
-		void LoadPlugins()
-		{
-			var dir = Global.FilePathPrefix + "plugins";
-			if (Directory.Exists(dir))
-			{
-				// TODO Clear out or create localPlugins folder (maybe in program slot folder)
+        /// <summary>
+        /// Initial simple implementation.  Reads user/programN/plugins folder and 
+        /// use
+        /// </summary>
+        void LoadPlugins()
+        {
+            var dir = Global.FilePathPrefix + "plugins";
+            if (Directory.Exists(dir))
+            {
+                // TODO Clear out or create localPlugins folder (maybe in program slot folder)
 
-				Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for factory plugins");
-				var di = new DirectoryInfo(dir);
-				var files = di.GetFiles("*.dll");
-				foreach (FileInfo fi in files)
-				{
-					// TODO COPY plugin to loadedPlugins folder 
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for factory plugins");
+                var di = new DirectoryInfo(dir);
+                var zFiles = di.GetFiles("*.cplz");
+                foreach (var fi in zFiles)
+                {
+                    Debug.Console(0, "Found cplz: {0}. Unzipping into plugins directory", fi.Name);
+                    var result = CrestronZIP.Unzip(fi.FullName, di.FullName);
+                    Debug.Console(0, "UnZip Result: {0}", result.ToString());
+                    fi.Delete();
+                }
+                var files = di.GetFiles("*.dll");
+                Dictionary<string, Assembly> assyList = new Dictionary<string, Assembly>();
+                foreach (FileInfo fi in files)
+                {
+                    // TODO COPY plugin to loadedPlugins folder 
+                    // TODO LOAD that loadedPlugins dll file
+                    try
+                    {
+                        var assy = Assembly.LoadFrom(fi.FullName);
+                        var ver = assy.GetName().Version;
+                        var verStr = string.Format("{0}.{1}.{2}.{3}", ver.Major, ver.Minor, ver.Build, ver.Revision);
+                        assyList.Add(fi.FullName, assy);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded plugin file '{0}', version {1}", fi.FullName, verStr);
+                    }
+                    catch
+                    {
+                        Debug.Console(2, "Assembly {0} is not a custom assembly", fi.FullName);
+                        continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
+                    }
+                }
+                foreach (var assy in assyList)
+                {
+                    // iteratate this assembly's classes, looking for "LoadPlugin()" methods
+                    try
+                    {
+                        var types = assy.Value.GetTypes();
+                        foreach (var type in types)
+                        {
+                            try
+                            {
+                                var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
+                                var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
+                                if (loadPlugin != null)
+                                {
+                                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding type {0}", assy.Key, type.FullName);
+                                    loadPlugin.Invoke(null, null);
+                                }
+                            }
+                            catch
+                            {
+                                Debug.Console(2, "Load Plugin not found. {0} is not a plugin assembly", assy.Value.FullName);
+                                continue;
+                            }
 
-					// TODO LOAD that loadedPlugins dll file
+                        }
+                    }
+                    catch
+                    {
+                        Debug.Console(2, "Assembly {0} is not a custom assembly. Types cannot be loaded.", assy.Value.FullName);
+                        continue;
+                    }
+                }
+                // plugin dll will be loaded.  Any classes in plugin should have a static constructor
+                // that registers that class with the Core.DeviceFactory
+            }
+        }
 
-					var assy = Assembly.LoadFrom(fi.FullName);
-					var ver = assy.GetName().Version;
-					var verStr = string.Format("{0}.{1}.{2}.{3}", ver.Major, ver.Minor, ver.Build, ver.Revision);
-					Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded plugin file '{0}', version {1}", fi.FullName, verStr);
+        /// <summary>
+        /// Verifies filesystem is set up. IR, SGD, and programX folders
+        /// </summary>
+        bool SetupFilesystem()
+        {
+            Debug.Console(0, "Verifying and/or creating folder structure");
+            var configDir = Global.FilePathPrefix;
+            var configExists = Directory.Exists(configDir);
+            if (!configExists)
+                Directory.Create(configDir);
 
-					// iteratate this assembly's classes, looking for "LoadPlugin()" methods
-					var types = assy.GetTypes();
-					foreach (var type in types)
-					{
-						var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
-						var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
-						if (loadPlugin != null)
-						{
-							Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding type {0}", fi.FullName, type.FullName);
-							loadPlugin.Invoke(null, null);
-						}
-
-					}
-
-					// plugin dll will be loaded.  Any classes in plugin should have a static constructor
-					// that registers that class with the Core.DeviceFactory
-				}
-			}
-		}
-
-		/// <summary>
-		/// Verifies filesystem is set up. IR, SGD, and programX folders
-		/// </summary>
-		bool SetupFilesystem()
-		{
-			Debug.Console(0, "Verifying and/or creating folder structure");
-			var configDir = Global.FilePathPrefix;
-			var configExists = Directory.Exists(configDir);
-			if (!configExists)
-				Directory.Create(configDir);
-
-			var irDir = Global.FilePathPrefix + "ir";
-			if (!Directory.Exists(irDir))
-				Directory.Create(irDir);
+            var irDir = Global.FilePathPrefix + "ir";
+            if (!Directory.Exists(irDir))
+                Directory.Create(irDir);
 
             var sgdDir = Global.FilePathPrefix + "sgd";
 			if (!Directory.Exists(sgdDir))
 				Directory.Create(sgdDir);
 
+            var pluginDir = Global.FilePathPrefix + "plugins";
+            if (!Directory.Exists(pluginDir))
+                Directory.Create(pluginDir);
+
 			return configExists;
 		}
 
@@ -292,13 +344,13 @@ namespace PepperDash.Essentials
 			DeviceManager.ActivateAll();
 
             LinkSystemMonitorToAppServer();
-		}
+        }
 
         void LinkSystemMonitorToAppServer()
         {
             var sysMon = DeviceManager.GetDeviceForKey("systemMonitor") as PepperDash.Essentials.Core.Monitoring.SystemMonitorController;
 
-            var appServer = DeviceManager.GetDeviceForKey("appServer") as CotijaSystemController;
+            var appServer = DeviceManager.GetDeviceForKey("appServer") as MobileControlSystemController;
 
 
             if (sysMon != null && appServer != null)
@@ -309,28 +361,31 @@ namespace PepperDash.Essentials
 
                 messenger.RegisterWithAppServer(appServer);
 
-                DeviceManager.AddDevice(messenger);                  
+                DeviceManager.AddDevice(messenger);
             }
         }
 
-		/// <summary>
-		/// Reads all devices from config and adds them to DeviceManager
-		/// </summary>
-		public void LoadDevices()
-		{
-			// Build the processor wrapper class
-			DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
+        /// <summary>
+        /// Reads all devices from config and adds them to DeviceManager
+        /// </summary>
+        public void LoadDevices()
+        {
+            // Build the processor wrapper class
+
+            DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
+
+
 
             // Add global System Monitor device
             DeviceManager.AddDevice(new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
 
-			foreach (var devConf in ConfigReader.ConfigObject.Devices)
-			{
+            foreach (var devConf in ConfigReader.ConfigObject.Devices)
+            {
 
-				try
-				{
+                try
+                {
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Creating device '{0}', type '{1}'", devConf.Key, devConf.Type);
-					// Skip this to prevent unnecessary warnings
+                    // Skip this to prevent unnecessary warnings
                     if (devConf.Key == "processor")
                     {
                         if (devConf.Type.ToLower() != Global.ControlSystem.ControllerPrompt.ToLower())
@@ -338,16 +393,35 @@ namespace PepperDash.Essentials
                                 "WARNING: Config file defines processor type as '{0}' but actual processor is '{1}'!  Some ports may not be available",
                                 devConf.Type.ToUpper(), Global.ControlSystem.ControllerPrompt.ToUpper());
 
+                        // Check if the processor is a DMPS model
+                        if (this.ControllerPrompt.IndexOf("dmps", StringComparison.OrdinalIgnoreCase) > -1)
+                        {
+                            Debug.Console(2, "Adding DmpsRoutingController for {0} to Device Manager.", this.ControllerPrompt);
+
+                            var propertiesConfig = JsonConvert.DeserializeObject<DM.Config.DmpsRoutingPropertiesConfig>(devConf.Properties.ToString());
+
+                            if(propertiesConfig == null)
+                                propertiesConfig =  new DM.Config.DmpsRoutingPropertiesConfig();
+
+                            var dmpsRoutingController = DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, propertiesConfig);
+
+                            DeviceManager.AddDevice(dmpsRoutingController);
+                        }
+                        else
+                        {
+                            Debug.Console(2, "************Processor is not DMPS type***************");
+                        }
+
                         continue;
                     }
 
-					// Try local factories first
-					var newDev = DeviceFactory.GetDevice(devConf);
+                    // Try local factories first
+                    var newDev = DeviceFactory.GetDevice(devConf);
 
                     if (newDev == null)
                         newDev = BridgeFactory.GetDevice(devConf);
 
-					// Then associated library factories
+                    // Then associated library factories
                     if (newDev == null)
                         newDev = PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
 					if (newDev == null)
@@ -356,8 +430,6 @@ namespace PepperDash.Essentials
 						newDev = PepperDash.Essentials.DM.DeviceFactory.GetDevice(devConf);
 					if (newDev == null)
 						newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
-					if (newDev == null)
-						newDev = PepperDash.Essentials.BridgeFactory.GetDevice(devConf);
 
 					//if (newDev == null) // might want to consider the ability to override an essentials "type"
 					//{
@@ -376,74 +448,74 @@ namespace PepperDash.Essentials
 						DeviceManager.AddDevice(newDev);
 					else
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
-				}
-				catch (Exception e)
-				{
+                }
+                catch (Exception e)
+                {
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "ERROR: Creating device {0}. Skipping device. \r{1}", devConf.Key, e);
-				} 
-			}
+                }
+            }
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Devices Loaded.");
 
-		}
+        }
 
 
-		/// <summary>
-		/// Helper method to load tie lines.  This should run after devices have loaded
-		/// </summary>
-		public void LoadTieLines()
-		{
-			// In the future, we can't necessarily just clear here because devices
-			// might be making their own internal sources/tie lines
+        /// <summary>
+        /// Helper method to load tie lines.  This should run after devices have loaded
+        /// </summary>
+        public void LoadTieLines()
+        {
+            // In the future, we can't necessarily just clear here because devices
+            // might be making their own internal sources/tie lines
 
-			var tlc = TieLineCollection.Default;
-			//tlc.Clear();
-			if (ConfigReader.ConfigObject.TieLines == null)
-			{
-				return;
-			}
+            var tlc = TieLineCollection.Default;
+            //tlc.Clear();
+            if (ConfigReader.ConfigObject.TieLines == null)
+            {
+                return;
+            }
 
-			foreach (var tieLineConfig in ConfigReader.ConfigObject.TieLines)
-			{
-				var newTL = tieLineConfig.GetTieLine();
-				if (newTL != null)
-					tlc.Add(newTL);
-			}
+            foreach (var tieLineConfig in ConfigReader.ConfigObject.TieLines)
+            {
+                var newTL = tieLineConfig.GetTieLine();
+                if (newTL != null)
+                    tlc.Add(newTL);
+            }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Tie Lines Loaded.");
 
-		}
+        }
 
-		/// <summary>
-		/// Reads all rooms from config and adds them to DeviceManager
-		/// </summary>
-		public void LoadRooms()
-		{
-			if (ConfigReader.ConfigObject.Rooms == null)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Warning, "WARNING: Configuration contains no rooms");
-				return;
-			}
+        /// <summary>
+        /// Reads all rooms from config and adds them to DeviceManager
+        /// </summary>
+        public void LoadRooms()
+        {
+            if (ConfigReader.ConfigObject.Rooms == null)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Warning, "WARNING: Configuration contains no rooms");
+                return;
+            }
 
-			foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
-			{
+            foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
+            {
                 var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as EssentialsRoomBase;
-				if (room != null)
-				{
+                if (room != null)
+                {
                     if (room is EssentialsHuddleSpaceRoom)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
+                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
 
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Cotija Bridge...");
-						// Cotija bridge
-						var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
-						AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-						DeviceManager.AddDevice(bridge);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
+                        // Mobile Control bridge
+                        var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room as EssentialsHuddleSpaceRoom);
+                        AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
+                        DeviceManager.AddDevice(bridge);
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Cotija Bridge Added...");
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
                     }
                     else if (room is EssentialsHuddleVtc1Room)
                     {
@@ -452,60 +524,60 @@ namespace PepperDash.Essentials
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
 
-						Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Cotija Bridge...");
-						// Cotija bridge
-						var bridge = new CotijaEssentialsHuddleSpaceRoomBridge(room);
-						AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
-						DeviceManager.AddDevice(bridge);				
-                    }					
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
+                        // Mobile Control bridge
+                        var bridge = new MobileConrolEssentialsHuddleSpaceRoomBridge(room);
+                        AddBridgePostActivationHelper(bridge); // Lets things happen later when all devices are present
+                        DeviceManager.AddDevice(bridge);
+                    }
                     else
                     {
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsRoom, attempting to add to DeviceManager w/o Fusion");
                         DeviceManager.AddDevice(room);
                     }
 
-				}
-				else
+                }
+                else
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create room from config, key '{0}'", roomConfig.Key);
-			}
+            }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");
 
-		}
+        }
 
-		/// <summary>
-		/// Helps add the post activation steps that link bridges to main controller
-		/// </summary>
-		/// <param name="bridge"></param>
-		void AddBridgePostActivationHelper(CotijaBridgeBase bridge)
-		{
-			bridge.AddPostActivationAction(() =>
-			{
-				var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as CotijaSystemController;
-				if (parent == null)
-				{
-					Debug.Console(0, bridge, "ERROR: Cannot connect app server room bridge. System controller not present");
-					return;
-				}
-				Debug.Console(0, bridge, "Linking to parent controller");
-				bridge.AddParent(parent);
-				parent.AddBridge(bridge);
-			});
-		}
+        /// <summary>
+        /// Helps add the post activation steps that link bridges to main controller
+        /// </summary>
+        /// <param name="bridge"></param>
+        void AddBridgePostActivationHelper(MobileControlBridgeBase bridge)
+        {
+            bridge.AddPostActivationAction(() =>
+            {
+                var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;
+                if (parent == null)
+                {
+                    Debug.Console(0, bridge, "ERROR: Cannot connect app server room bridge. System controller not present");
+                    return;
+                }
+                Debug.Console(0, bridge, "Linking to parent controller");
+                bridge.AddParent(parent);
+                parent.AddBridge(bridge);
+            });
+        }
 
-		/// <summary>
-		/// Fires up a logo server if not already running
-		/// </summary>
-		void LoadLogoServer()
-		{
-			try
-			{
+        /// <summary>
+        /// Fires up a logo server if not already running
+        /// </summary>
+        void LoadLogoServer()
+        {
+            try
+            {
                 LogoServer = new HttpLogoServer(8080, Global.DirectorySeparator + "html" + Global.DirectorySeparator + "logo");
             }
-			catch (Exception)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
-			}
-		}
-	}
+            catch (Exception)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
+            }
+        }
+    }
 }

PepperDashEssentials/Devices/Amplifier.cs

@@ -12,6 +12,32 @@ namespace PepperDash.Essentials
 {
     public class Amplifier : Device, IRoutingSinkNoSwitching
     {
+        public event SourceInfoChangeHandler CurrentSourceChange;
+
+        public string CurrentSourceInfoKey { get; set; }
+        public SourceListItem CurrentSourceInfo
+        {
+            get
+            {
+                return _CurrentSourceInfo;
+            }
+            set
+            {
+                if (value == _CurrentSourceInfo) return;
+
+                var handler = CurrentSourceChange;
+
+                if (handler != null)
+                    handler(_CurrentSourceInfo, ChangeType.WillChange);
+
+                _CurrentSourceInfo = value;
+
+                if (handler != null)
+                    handler(_CurrentSourceInfo, ChangeType.DidChange);
+            }
+        }
+        SourceListItem _CurrentSourceInfo;
+
         public RoutingInputPort AudioIn { get; private set; }
 
         public Amplifier(string key, string name)

PepperDashEssentials/Factory/DeviceFactory.cs

@@ -43,13 +43,13 @@ namespace PepperDash.Essentials
                 return new Device(key, name);
             }
 
-            // MOVE into something else???
-            else if (typeName == "basicirdisplay")
-            {
-                var ir = IRPortHelper.GetIrPort(properties);
-                if (ir != null)
-                    return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
-            }
+            //// MOVE into something else???
+            //else if (typeName == "basicirdisplay")
+            //{
+            //    var ir = IRPortHelper.GetIrPort(properties);
+            //    if (ir != null)
+            //        return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
+            //}
 
             else if (typeName == "commmock")
             {
@@ -61,18 +61,18 @@ namespace PepperDash.Essentials
 
             else if (typeName == "appserver")
             {
-                var props = JsonConvert.DeserializeObject<CotijaConfig>(properties.ToString());
-                return new CotijaSystemController(key, name, props);
+                var props = JsonConvert.DeserializeObject<MobileControlConfig>(properties.ToString());
+                return new MobileControlSystemController(key, name, props);
             }
 
 			else if (typeName == "mobilecontrolbridge-ddvc01")
 			{
 				var comm = CommFactory.GetControlPropertiesConfig(dc);
 
-				var bridge = new PepperDash.Essentials.Room.Cotija.CotijaDdvc01RoomBridge(key, name, comm.IpIdInt);
+				var bridge = new PepperDash.Essentials.Room.MobileControl.MobileControlDdvc01RoomBridge(key, name, comm.IpIdInt);
 				bridge.AddPreActivationAction(() =>
 				{
-					var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as CotijaSystemController;
+					var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;
 					if (parent == null)
 					{
 						Debug.Console(0, bridge, "ERROR: Cannot connect bridge. System controller not present");
@@ -87,7 +87,7 @@ namespace PepperDash.Essentials
 
             else if (typeName == "roomonwhenoccupancydetectedfeature")
             {
-                return new Room.Behaviours.RoomOnToDefaultSourceWhenOccupied(dc);
+                return new RoomOnToDefaultSourceWhenOccupied(dc);
             }
 
 			return null;

PepperDashEssentials/Factory/UiDeviceFactory.cs

@@ -1,162 +1,191 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.PageManagers;
-
-
-namespace PepperDash.Essentials
-{
-    public class UiDeviceFactory
-    {
-        public static IKeyed GetUiDevice(DeviceConfig config)
-        {
-            var comm = CommFactory.GetControlPropertiesConfig(config);
-
-            var props = JsonConvert.DeserializeObject<CrestronTouchpanelPropertiesConfig>(config.Properties.ToString());
-
-            EssentialsTouchpanelController panelController = new EssentialsTouchpanelController(config.Key, config.Name, config.Type, props, comm.IpIdInt);
-
-            panelController.AddPostActivationAction(() =>
-                {
-                     var mainDriver = new EssentialsPanelMainInterfaceDriver(panelController.Panel, props);
-                    // Then the sub drivers
-
-                    // spin up different room drivers depending on room type
-                    var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
-                    if (room is EssentialsHuddleSpaceRoom)
-                    {
-
-                        // Header Driver
-                        Debug.Console(0, panelController, "Adding header driver");
-                        mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
-                        
-                        // AV Driver
-                        Debug.Console(0, panelController, "Adding huddle space AV driver");
-                        var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
-                        avDriver.DefaultRoomKey = props.DefaultRoomKey;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.UI;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.PageManagers;
+using PepperDash.Essentials.DM.Endpoints.DGEs;
+
+
+namespace PepperDash.Essentials
+{
+    public class UiDeviceFactory
+    {
+        public static IKeyed GetUiDevice(DeviceConfig config)
+        {
+            var comm = CommFactory.GetControlPropertiesConfig(config);
+
+            var typeName = config.Type.ToLower();
+
+            EssentialsTouchpanelController panelController = null;
+
+            var props = JsonConvert.DeserializeObject<CrestronTouchpanelPropertiesConfig>(config.Properties.ToString());
+
+            if (typeName.Contains("dge"))
+            {
+                Dge100 dgeDevice = null;
+                if (typeName == "dge100")
+                    dgeDevice = new Dge100(comm.IpIdInt, Global.ControlSystem);
+                else if (typeName == "dmdge200c")
+                    dgeDevice = new DmDge200C(comm.IpIdInt, Global.ControlSystem);
+
+                if (dgeDevice == null)
+                {
+                    Debug.Console(1, "Unable to create DGE device");
+                    return null;
+                }
+
+                var dgeController = new DgeController(config.Key + "-comPorts", config.Name, dgeDevice, config, props);
+
+                DeviceManager.AddDevice(dgeController);
+
+                panelController = new EssentialsTouchpanelController(config.Key, config.Name, dgeController.DigitalGraphicsEngine,
+                    props.ProjectName, props.SgdFile);
+            }
+            else
+            {
+                panelController = new EssentialsTouchpanelController(config.Key, config.Name, config.Type, props, comm.IpIdInt);
+            }
+
+            panelController.AddPostActivationAction(() =>
+                {
+                     var mainDriver = new EssentialsPanelMainInterfaceDriver(panelController.Panel, props);
+                    // Then the sub drivers
+
+                    // spin up different room drivers depending on room type
+                    var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
+                    if (room is EssentialsHuddleSpaceRoom)
+                    {
+
+                        // Header Driver
+                        Debug.Console(0, panelController, "Adding header driver");
+                        mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
+                        
+                        // AV Driver
+                        Debug.Console(0, panelController, "Adding huddle space AV driver");
+                        var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
+                        avDriver.DefaultRoomKey = props.DefaultRoomKey;
                         mainDriver.AvDriver = avDriver;
                         avDriver.CurrentRoom = room as EssentialsHuddleSpaceRoom;
-                        
-                        // Environment Driver
-                        if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
-                        {
-                            Debug.Console(0, panelController, "Adding environment driver");
-                            mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
-
-                            mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
-                        }
-
-                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
-
-                        panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
-
-                        if (panelController.Panel is TswFt5ButtonSystem)
-                        {
-                            var tsw = panelController.Panel as TswFt5ButtonSystem;
-                            // Wire up hard keys
-                            tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
-                            //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                            if(mainDriver.EnvironmentDriver != null)
-                                tsw.Lights.UserObject = new Action<bool>(b => 
-                                {
-                                    if (!b)
-                                    {
-                                        //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
-                                        mainDriver.EnvironmentDriver.Toggle();
-                                    }
-                                });
-                            tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                            tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                        }
-                    }
-                    //else if (room is EssentialsPresentationRoom)
-                    //{
-                    //    Debug.Console(0, panelController, "Adding presentation room driver");
-                    //    var avDriver = new EssentialsPresentationPanelAvFunctionsDriver(mainDriver, props);
-                    //    avDriver.CurrentRoom = room as EssentialsPresentationRoom;
-                    //    avDriver.DefaultRoomKey = props.DefaultRoomKey;
-                    //    mainDriver.AvDriver = avDriver ;
-                    //    mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
-                    //    panelController.LoadAndShowDriver(mainDriver);
-
-                    //    if (panelController.Panel is TswFt5ButtonSystem)
-                    //    {
-                    //        var tsw = panelController.Panel as TswFt5ButtonSystem;
-                    //        // Wire up hard keys
-                    //        tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
-                    //        //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                    //        tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                    //        tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                    //    }
-                    //}
-                    else if (room is EssentialsHuddleVtc1Room)
-                    {
-                        Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
-
-                        // Header Driver
-                        mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
-
-                        // AV Driver
-                        var avDriver = new EssentialsHuddleVtc1PanelAvFunctionsDriver(mainDriver, props);
-
-                        var codecDriver = new PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver(panelController.Panel, avDriver,
-                            (room as EssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
-                        avDriver.SetVideoCodecDriver(codecDriver);
-                        avDriver.DefaultRoomKey = props.DefaultRoomKey;
+                        
+                        // Environment Driver
+                        if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
+                        {
+                            Debug.Console(0, panelController, "Adding environment driver");
+                            mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
+
+                            mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
+                        }
+
+                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
+
+                        panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
+
+                        if (panelController.Panel is TswFt5ButtonSystem)
+                        {
+                            var tsw = panelController.Panel as TswFt5ButtonSystem;
+                            // Wire up hard keys
+                            tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
+                            //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
+                            if(mainDriver.EnvironmentDriver != null)
+                                tsw.Lights.UserObject = new Action<bool>(b => 
+                                {
+                                    if (!b)
+                                    {
+                                        //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
+                                        mainDriver.EnvironmentDriver.Toggle();
+                                    }
+                                });
+                            tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
+                            tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
+                        }
+                    }
+                    //else if (room is EssentialsPresentationRoom)
+                    //{
+                    //    Debug.Console(0, panelController, "Adding presentation room driver");
+                    //    var avDriver = new EssentialsPresentationPanelAvFunctionsDriver(mainDriver, props);
+                    //    avDriver.CurrentRoom = room as EssentialsPresentationRoom;
+                    //    avDriver.DefaultRoomKey = props.DefaultRoomKey;
+                    //    mainDriver.AvDriver = avDriver ;
+                    //    mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
+                    //    panelController.LoadAndShowDriver(mainDriver);
+
+                    //    if (panelController.Panel is TswFt5ButtonSystem)
+                    //    {
+                    //        var tsw = panelController.Panel as TswFt5ButtonSystem;
+                    //        // Wire up hard keys
+                    //        tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.PowerButtonPressed(); });
+                    //        //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
+                    //        tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
+                    //        tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
+                    //    }
+                    //}
+                    else if (room is EssentialsHuddleVtc1Room)
+                    {
+                        Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
+
+                        // Header Driver
+                        mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
+
+                        // AV Driver
+                        var avDriver = new EssentialsHuddleVtc1PanelAvFunctionsDriver(mainDriver, props);
+
+                        var codecDriver = new PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver(panelController.Panel, avDriver,
+                            (room as EssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
+                        avDriver.SetVideoCodecDriver(codecDriver);
+                        avDriver.DefaultRoomKey = props.DefaultRoomKey;
                         mainDriver.AvDriver = avDriver;
-                        avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room;
-
-                        // Environment Driver
-                        if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
-                        {
-                            Debug.Console(0, panelController, "Adding environment driver");
-                            mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
-
-                            mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
-                        }
-
-                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
-
-                        panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
-
-                        if (panelController.Panel is TswFt5ButtonSystem)
-                        {
-                            var tsw = panelController.Panel as TswFt5ButtonSystem;
-                            // Wire up hard keys
-                            tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.EndMeetingPress(); });
-                            //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
-                            if (mainDriver.EnvironmentDriver != null)
-                                tsw.Lights.UserObject = new Action<bool>(b =>
-                                {
-                                    if (!b)
-                                    {
-                                        //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
-                                        mainDriver.EnvironmentDriver.Toggle();
-                                    }
-                                });
-                            tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
-                            tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
-                        }
-                    }
-                    else
-                    {
-                        Debug.Console(0, panelController, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", props.DefaultRoomKey);
-                    }
-                });
-
-            return panelController;
-        }
-
-    }
+                        avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room;
+
+                        // Environment Driver
+                        if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
+                        {
+                            Debug.Console(0, panelController, "Adding environment driver");
+                            mainDriver.EnvironmentDriver = new EssentialsEnvironmentDriver(mainDriver, props);
+
+                            mainDriver.EnvironmentDriver.GetDevicesFromConfig(avDriver.CurrentRoom.PropertiesConfig.Environment);
+                        }
+
+                        mainDriver.HeaderDriver.SetupHeaderButtons(avDriver, avDriver.CurrentRoom);
+
+                        panelController.LoadAndShowDriver(mainDriver);  // This is a little convoluted.
+
+                        if (panelController.Panel is TswFt5ButtonSystem)
+                        {
+                            var tsw = panelController.Panel as TswFt5ButtonSystem;
+                            // Wire up hard keys
+                            tsw.Power.UserObject = new Action<bool>(b => { if (!b) avDriver.EndMeetingPress(); });
+                            //tsw.Home.UserObject = new Action<bool>(b => { if (!b) HomePressed(); });
+                            if (mainDriver.EnvironmentDriver != null)
+                                tsw.Lights.UserObject = new Action<bool>(b =>
+                                {
+                                    if (!b)
+                                    {
+                                        //mainDriver.AvDriver.PopupInterlock.ShowInterlockedWithToggle(mainDriver.EnvironmentDriver.BackgroundSubpageJoin);
+                                        mainDriver.EnvironmentDriver.Toggle();
+                                    }
+                                });
+                            tsw.Up.UserObject = new Action<bool>(avDriver.VolumeUpPress);
+                            tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(0, panelController, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", props.DefaultRoomKey);
+                    }
+                });
+
+            return panelController;
+        }
+
+    }
 }

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -14,6 +14,7 @@ using PepperDash.Core;
 using PepperDash.Essentials;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Fusion;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Devices.Common.Occupancy;
 
@@ -181,7 +182,7 @@ namespace PepperDash.Essentials.Fusion
             // Moved to 
             CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as EssentialsHuddleVtc1Room).CurrentSingleSourceChange += Room_CurrentSourceInfoChange;
+            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
             FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
@@ -220,7 +221,7 @@ namespace PepperDash.Essentials.Fusion
                         break;
                 }
 
-                var laptops = dict.Where(d => d.Value.SourceDevice is Laptop);
+                var laptops = dict.Where(d => d.Value.SourceDevice is Core.Devices.Laptop);
                 i = 1;
                 foreach (var kvp in laptops)
                 {

PepperDashEssentials/PepperDashEssentials.csproj

@@ -48,32 +48,32 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.3.27452, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\essentials-framework\references\PepperDash_Core.dll</HintPath>
+      <HintPath>..\essentials-framework\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -81,33 +81,34 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
-    <Reference Include="SimplSharpPro, Version=1.5.2.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AppServer\Messengers\ConfigMessenger.cs" />
     <Compile Include="AppServer\Messengers\Ddvc01AtcMessenger.cs" />
     <Compile Include="AppServer\Messengers\AudioCodecBaseMessenger.cs" />
     <Compile Include="AppServer\Messengers\Ddvc01VtcMessenger.cs" />
@@ -115,19 +116,44 @@
     <Compile Include="AppServer\Messengers\SystemMonitorMessenger.cs" />
     <Compile Include="AppServer\Messengers\VideoCodecBaseMessenger.cs" />
     <Compile Include="Audio\EssentialsVolumeLevelConfig.cs" />
+    <Compile Include="Bridges\AppleTvBridge.cs" />
     <Compile Include="Bridges\BridgeBase.cs" />
     <Compile Include="Bridges\BridgeFactory.cs" />
     <Compile Include="Bridges\CameraControllerBridge.cs" />
+    <Compile Include="Bridges\AirMediaControllerBridge.cs" />
+    <Compile Include="Bridges\DmBladeChassisControllerBridge.cs" />
+    <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
+    <Compile Include="Bridges\DmpsAudioOutputControllerBridge.cs" />
+    <Compile Include="Bridges\DmpsRoutingControllerBridge.cs" />
     <Compile Include="Bridges\DisplayControllerBridge.cs" />
     <Compile Include="Bridges\DigitalLoggerBridge.cs" />
     <Compile Include="Bridges\DmChassisControllerBridge.cs" />
     <Compile Include="Bridges\DmTxControllerBridge.cs" />
     <Compile Include="Bridges\GenericLightingBridge.cs" />
     <Compile Include="Bridges\GenericRelayDeviceBridge.cs" />
+    <Compile Include="Bridges\GlsOccupancySensorBaseControllerBridge.cs" />
+    <Compile Include="Bridges\HdMdxxxCEControllerBridge.cs" />
     <Compile Include="Bridges\IBasicCommunicationBridge.cs" />
     <Compile Include="Bridges\DmRmcControllerBridge.cs" />
+    <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Bridges\IDigitalInputBridge.cs" />
-    <Compile Include="Bridges\JoinMapBase.cs" />
+    <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\CameraControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DigitalLoggerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DisplayControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmChassisControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsAudioOutputControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsRoutingControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmRmcControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmTxControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericLightingJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericRelayControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\HdMdxxxCEControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GlsOccupancySensorBaseJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
     <Compile Include="Bridges\SystemMonitorBridge.cs" />
     <Compile Include="Configuration ORIGINAL\Builders\TPConfig.cs" />
     <Compile Include="Configuration ORIGINAL\Configuration.cs" />
@@ -149,27 +175,23 @@
     <Compile Include="Devices\NUMERIC AppleTV.cs" />
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Factory\UiDeviceFactory.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\EssentialsHuddleVtc1FusionController.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionCustomPropertiesBridge.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionEventHandlers.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionProcessorQueries.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionRviDataClasses.cs" />
+    <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
     <Compile Include="REMOVE EssentialsApp.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
     <Compile Include="HttpApiHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
+    <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
+    <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsRoomEmergencyConfig.cs" />
-    <Compile Include="AppServer\CotijaConfig.cs" />
-    <Compile Include="AppServer\CotijaDdvc01DeviceBridge.cs" />
+    <Compile Include="AppServer\MobileControlConfig.cs" />
+    <Compile Include="AppServer\MobileControlDdvc01DeviceBridge.cs" />
     <Compile Include="AppServer\Interfaces.cs" />
-    <Compile Include="AppServer\RoomBridges\CotijaBridgeBase.cs" />
-    <Compile Include="AppServer\RoomBridges\CotijaDdvc01RoomBridge.cs" />
-    <Compile Include="AppServer\RoomBridges\CotijaEssentialsHuddleSpaceRoomBridge.cs" />
+    <Compile Include="AppServer\RoomBridges\MobileControlBridgeBase.cs" />
+    <Compile Include="AppServer\RoomBridges\MobileControlDdvc01RoomBridge.cs" />
+    <Compile Include="AppServer\RoomBridges\MobileControlEssentialsHuddleSpaceRoomBridge.cs" />
     <Compile Include="AppServer\DeviceTypeInterfaces\IChannelExtensions.cs" />
     <Compile Include="AppServer\DeviceTypeInterfaces\IColorExtensions.cs" />
     <Compile Include="AppServer\DeviceTypeInterfaces\IDPadExtensions.cs" />
@@ -181,9 +203,10 @@
     <Compile Include="AppServer\RoomBridges\SourceDeviceMapDictionary.cs" />
     <Compile Include="AppServer\Volumes.cs" />
     <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
+    <Compile Include="Room\Types\EssentialsDualDisplayRoom.cs" />
     <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
+    <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
     <Compile Include="Room\Types\EssentialsPresentationRoom.cs" />
-    <Compile Include="Room\Types\EssentialsRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
     <Compile Include="FOR REFERENCE UI\PageControllers\DevicePageControllerBase.cs" />
     <Compile Include="FOR REFERENCE UI\PageControllers\PageControllerLaptop.cs" />
@@ -217,10 +240,9 @@
     <Compile Include="UIDrivers\Page Drivers\SingleSubpageModalAndBackDriver.cs" />
     <Compile Include="UIDrivers\SmartObjectRoomsList.cs" />
     <Compile Include="UI\JoinConstants\UIBoolJoin.cs" />
-    <Compile Include="AppServer\CotijaSystemController.cs" />
+    <Compile Include="AppServer\MobileControlSystemController.cs" />
     <Compile Include="UI\DualDisplaySourceSRLController.cs" />
     <Compile Include="UI\SubpageReferenceListActivityItem.cs" />
-    <Compile Include="UI\CrestronTouchpanelPropertiesConfig.cs" />
     <Compile Include="FOR REFERENCE UI\Panels\REMOVE UiCue.cs" />
     <Compile Include="FOR REFERENCE UI\SRL\SourceListSubpageReferenceList.cs" />
     <Compile Include="Room\Types\EssentialsHuddleSpaceRoom.cs" />
@@ -228,9 +250,15 @@
     <Compile Include="UI\SubpageReferenceListSourceItem.cs" />
     <None Include="app.config" />
     <None Include="Properties\ControlSystem.cfg" />
-    <EmbeddedResource Include="SGD\PepperDash Essentials iPad.sgd" />
-    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-560.sgd" />
-    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-760.sgd" />
+    <EmbeddedResource Include="SGD\PepperDash Essentials iPad.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-560.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-760.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
@@ -242,6 +270,9 @@
       <Name>Essentials Devices Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FOR REFERENCE UI\OTHER\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1

@@ -0,0 +1,35 @@
+function Update-SourceVersion
+{
+    Param ([string]$Version)
+    $NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’;
+    foreach ($o in $input)
+    {
+        Write-output $o.FullName
+        $TmpFile = $o.FullName + “.tmp”
+        get-content $o.FullName |
+        %{$_ -replace ‘AssemblyVersion\("(\d+\.\d+\.\d+)\.\*"\)’, $NewVersion  }  > $TmpFile
+        move-item $TmpFile $o.FullName -force
+    }
+}
+
+function Update-AllAssemblyInfoFiles ( $version )
+{
+    foreach ($file in “AssemblyInfo.cs”, “AssemblyInfo.vb” )
+    {
+        get-childitem -recurse |? {$_.Name -eq $file} | Update-SourceVersion $version ;
+    }
+}
+
+# validate arguments
+$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$");
+if ($r.Success)
+{
+    Update-AllAssemblyInfoFiles $args[0];
+}
+else
+{
+    echo ” “;
+    echo “Error: Input version does not match x.y.z format!”
+    echo ” “;
+    echo "Unable to apply version to AssemblyInfo.cs files";
+}

PepperDashEssentials/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Room.Config
+{
+    public class EssentialsDualDisplayRoomPropertiesConfig : EssentialsNDisplayRoomPropertiesConfig
+    {
+
+    }
+}

PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs

@@ -8,19 +8,10 @@ using Newtonsoft.Json;
 namespace PepperDash.Essentials.Room.Config
 {
 
-    public class EssentialsHuddleVtc1PropertiesConfig : EssentialsRoomPropertiesConfig
+    public class EssentialsHuddleVtc1PropertiesConfig : EssentialsConferenceRoomPropertiesConfig
     {
 		[JsonProperty("defaultDisplayKey")]
 		public string DefaultDisplayKey { get; set; }
-		[JsonProperty("defaultAudioKey")]
-		public string DefaultAudioKey { get; set; }
-		[JsonProperty("sourceListKey")]
-		public string SourceListKey { get; set; }
-		[JsonProperty("defaultSourceItem")]
-		public string DefaultSourceItem { get; set; }
-		[JsonProperty("videoCodecKey")]
-		public string VideoCodecKey { get; set; }
-		[JsonProperty("audioCodecKey")]
-		public string AudioCodecKey { get; set; }
+
     }
 }

PepperDashEssentials/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Room.Config
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsNDisplayRoomPropertiesConfig : EssentialsConferenceRoomPropertiesConfig
+    {
+        [JsonProperty("defaultAudioBehavior")]
+        public string DefaultAudioBehavior { get; set; }
+        [JsonProperty("defaultVideoBehavior")]
+        public string DefaultVideoBehavior { get; set; }
+        [JsonProperty("displays")]
+        public Dictionary<eSourceListItemDestinationTypes, DisplayItem> Displays { get; set; }
+
+        public EssentialsNDisplayRoomPropertiesConfig()
+        {
+            Displays = new Dictionary<eSourceListItemDestinationTypes, DisplayItem>();
+        }
+
+    }
+
+    public class DisplayItem : IKeyName
+    {
+        public string Key { get; set; }
+        public string Name { get; set; }
+    }
+
+}

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -38,6 +38,12 @@ namespace PepperDash.Essentials.Room.Config
 			{
 				return new Device(roomConfig.Key, roomConfig.Name); // placeholder device that does nothing.
 			}
+            else if (typeName == "dualdisplay")
+            {
+                var rm = new EssentialsDualDisplayRoom(roomConfig);
+
+                return rm;
+            }
 
             return null;
 		}
@@ -65,18 +71,18 @@ namespace PepperDash.Essentials.Room.Config
 		/// <param name="props"></param>
 		/// <param name="room"></param>
 		/// <returns></returns>
-		public static PepperDash.Essentials.Devices.Common.Microphones.MicrophonePrivacyController GetMicrophonePrivacy(
-			EssentialsRoomPropertiesConfig props, EssentialsHuddleVtc1Room room)
+		public static Core.Privacy.MicrophonePrivacyController GetMicrophonePrivacy(
+			EssentialsRoomPropertiesConfig props, IPrivacy room)
 		{
 			var microphonePrivacy = props.MicrophonePrivacy;
 			if (microphonePrivacy == null)
 			{
-				Debug.Console(0, "ERROR: Cannot create microphone privacy with null properties");
+				Debug.Console(0, "Cannot create microphone privacy with null properties");
 				return null;
 			}
 			// Get the MicrophonePrivacy device from the device manager
 			var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as
-				PepperDash.Essentials.Devices.Common.Microphones.MicrophonePrivacyController);
+				Core.Privacy.MicrophonePrivacyController);
 			// Set this room as the IPrivacy device
 			if (mP == null)
 			{
@@ -95,28 +101,30 @@ namespace PepperDash.Essentials.Room.Config
 			if (behaviour == "trackroomstate")
 			{
 				// Tie LED enable to room power state
-				room.OnFeedback.OutputChange += (o, a) =>
+                var essRoom = room as EssentialsRoomBase;
+                essRoom.OnFeedback.OutputChange += (o, a) =>
 				{
-					if (room.OnFeedback.BoolValue)
+                    if (essRoom.OnFeedback.BoolValue)
 						mP.EnableLeds = true;
 					else
 						mP.EnableLeds = false;
 				};
 
-				mP.EnableLeds = room.OnFeedback.BoolValue;
+                mP.EnableLeds = essRoom.OnFeedback.BoolValue;
 			}
 			else if (behaviour == "trackcallstate")
 			{
 				// Tie LED enable to room power state
-				room.InCallFeedback.OutputChange += (o, a) =>
+                var inCallRoom = room as IHasInCallFeedback;
+                inCallRoom.InCallFeedback.OutputChange += (o, a) =>
 				{
-					if (room.InCallFeedback.BoolValue)
+                    if (inCallRoom.InCallFeedback.BoolValue)
 						mP.EnableLeds = true;
 					else
 						mP.EnableLeds = false;
 				};
 
-				mP.EnableLeds = room.InCallFeedback.BoolValue;
+                mP.EnableLeds = inCallRoom.InCallFeedback.BoolValue;
 			}
 
 			return mP;
@@ -175,6 +183,25 @@ namespace PepperDash.Essentials.Room.Config
 		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 	}
 
+    public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
+    {
+        [JsonProperty("defaultAudioKey")]
+        public string DefaultAudioKey { get; set; }
+        [JsonProperty("sourceListKey")]
+        public string SourceListKey { get; set; }
+        [JsonProperty("defaultSourceItem")]
+        public string DefaultSourceItem { get; set; }
+
+    }
+
+    public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
+    {
+        [JsonProperty("videoCodecKey")]
+        public string VideoCodecKey { get; set; }
+        [JsonProperty("audioCodecKey")]
+        public string AudioCodecKey { get; set; }
+    }
+
 	public class EssentialsEnvironmentPropertiesConfig
 	{
 		public bool Enabled { get; set; }

PepperDashEssentials/Room/Emergency/EsentialsRoomEmergencyContactClosure.cs

@@ -12,15 +12,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials.Room
 {
-    public abstract class EssentialsRoomEmergencyBase : IKeyed
-    {
-        public string Key { get; private set; }
 
-        public EssentialsRoomEmergencyBase(string key)
-        {
-            Key = key;
-        }
-    }
 
 
     public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -0,0 +1,656 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Room.Config;
+using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.AudioCodec;
+
+namespace PepperDash.Essentials
+{
+    public class EssentialsDualDisplayRoom : EssentialsNDisplayRoomBase, IHasCurrentVolumeControls,
+        IRunRouteAction, IPrivacy, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasInCallFeedback
+    {
+        public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
+
+        public EssentialsDualDisplayRoomPropertiesConfig PropertiesConfig { get; private set; }
+
+        //************************
+        // Call-related stuff
+
+        public BoolFeedback InCallFeedback { get; private set; }
+
+        /// <summary>
+        /// States: 0 for on hook, 1 for video, 2 for audio, 3 for telekenesis
+        /// </summary>
+        public IntFeedback CallTypeFeedback { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public BoolFeedback PrivacyModeIsOnFeedback { get; private set; }
+
+        /// <summary>
+        /// When something in the room is sharing with the far end or through other means
+        /// </summary>
+        public BoolFeedback IsSharingFeedback { get; private set; }
+
+        public IRoutingSinkWithSwitching LeftDisplay { get; private set; }
+        public IRoutingSinkWithSwitching RightDisplay { get; private set; }
+
+
+        protected override Func<bool> OnFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    var leftDisp = LeftDisplay as DisplayBase;
+                    var rightDisp = RightDisplay as DisplayBase;
+                    var val = leftDisp != null && leftDisp.CurrentSourceInfo != null
+                        && leftDisp.CurrentSourceInfo.Type == eSourceListItemType.Route
+                        && rightDisp != null && rightDisp.CurrentSourceInfo != null
+                        && rightDisp.CurrentSourceInfo.Type == eSourceListItemType.Route;
+                    return val;
+                };
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected override Func<bool> IsWarmingFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    var leftDisp = LeftDisplay as DisplayBase;
+                    var rightDisp = RightDisplay as DisplayBase;
+                    if (leftDisp != null && RightDisplay != null)
+                        return leftDisp.IsWarmingUpFeedback.BoolValue || rightDisp.IsWarmingUpFeedback.BoolValue;
+                    else
+                        return false;
+                };
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected override Func<bool> IsCoolingFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    var leftDisp = LeftDisplay as DisplayBase;
+                    var rightDisp = RightDisplay as DisplayBase;
+                    if (leftDisp != null && RightDisplay != null)
+                        return leftDisp.IsCoolingDownFeedback.BoolValue || rightDisp.IsCoolingDownFeedback.BoolValue;
+                    else
+                        return false;
+                };
+            }
+        }
+
+        public IBasicVolumeControls DefaultAudioDevice { get; private set; }
+        public IBasicVolumeControls DefaultVolumeControls { get; private set; }
+
+        public VideoCodecBase VideoCodec { get; private set; }
+
+        public AudioCodecBase AudioCodec { get; private set; }
+
+        public bool ExcludeFromGlobalFunctions { get; set; }
+
+        public string DefaultSourceItem { get; set; }
+
+        public ushort DefaultVolume { get; set; }
+
+        /// <summary>
+        /// If room is off, enables power on to last source. Default true
+        /// </summary>
+        public bool EnablePowerOnToLastSource { get; set; }
+        string LastSourceKey;
+
+        /// <summary>
+        /// Sets the volume control device, and attaches/removes InUseTrackers with "audio"
+        /// tag to device.
+        /// </summary>
+        public IBasicVolumeControls CurrentVolumeControls
+        {
+            get { return _CurrentAudioDevice; }
+            set
+            {
+                if (value == _CurrentAudioDevice) return;
+
+                var oldDev = _CurrentAudioDevice;
+                // derigister this room from the device, if it can
+                if (oldDev is IInUseTracking)
+                    (oldDev as IInUseTracking).InUseTracker.RemoveUser(this, "audio");
+                var handler = CurrentVolumeDeviceChange;
+                if (handler != null)
+                    CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.WillChange));
+                _CurrentAudioDevice = value;
+                if (handler != null)
+                    CurrentVolumeDeviceChange(this, new VolumeDeviceChangeEventArgs(oldDev, value, ChangeType.DidChange));
+                // register this room with new device, if it can
+                if (_CurrentAudioDevice is IInUseTracking)
+                    (_CurrentAudioDevice as IInUseTracking).InUseTracker.AddUser(this, "audio");
+            }
+        }
+        IBasicVolumeControls _CurrentAudioDevice;
+
+        /// <summary>
+        /// "codecOsd"
+        /// </summary>
+        public string DefaultCodecRouteString { get { return "codecOsd"; } }
+
+        /// <summary>
+        /// Temporary implementation. Returns the schedule-ready object or null if none. Fow now,
+        /// always returns the VideoCodec if it is capable
+        /// </summary>
+        public IHasScheduleAwareness ScheduleSource { get { return VideoCodec as IHasScheduleAwareness; } }
+
+        CCriticalSection SourceSelectLock = new CCriticalSection();
+
+        public EssentialsDualDisplayRoom(DeviceConfig config)
+            : base(config)
+        {
+            try
+            {
+                PropertiesConfig = JsonConvert.DeserializeObject<EssentialsDualDisplayRoomPropertiesConfig>
+                    (config.Properties.ToString());
+
+                var leftDisp = PropertiesConfig.Displays[eSourceListItemDestinationTypes.leftDisplay];
+                if (leftDisp != null)
+                {
+                    if (!string.IsNullOrEmpty(leftDisp.Key))
+                    {
+                        LeftDisplay = DeviceManager.GetDeviceForKey(leftDisp.Key) as IRoutingSinkWithSwitching;
+                        Displays.Add(eSourceListItemDestinationTypes.leftDisplay, LeftDisplay);
+                    }
+                    else
+                        Debug.Console(0, this, "Unable to get LeftDisplay for Room");
+                }
+
+                var rightDisp = PropertiesConfig.Displays[eSourceListItemDestinationTypes.rightDisplay];
+                if (rightDisp != null)
+                {
+                    if (!string.IsNullOrEmpty(rightDisp.Key))
+                    {
+                        LeftDisplay = DeviceManager.GetDeviceForKey(rightDisp.Key) as IRoutingSinkWithSwitching;
+                        Displays.Add(eSourceListItemDestinationTypes.rightDisplay, RightDisplay);
+                    }
+                    else
+                        Debug.Console(0, this, "Unable to get LeftDisplay for Room");
+                }
+
+                VideoCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.VideoCodecKey) as
+                   PepperDash.Essentials.Devices.Common.VideoCodec.VideoCodecBase;
+                if (VideoCodec == null)
+                    throw new ArgumentNullException("codec cannot be null");
+
+                AudioCodec = DeviceManager.GetDeviceForKey(PropertiesConfig.AudioCodecKey) as
+                    PepperDash.Essentials.Devices.Common.AudioCodec.AudioCodecBase;
+                if (AudioCodec == null)
+                    Debug.Console(0, this, "No Audio Codec Found");
+
+                DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
+
+                Initialize();
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error building room \n{0}", e);
+            }
+        }
+
+        void Initialize()
+        {
+            if (DefaultAudioDevice is IBasicVolumeControls)
+                DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
+            else if (DefaultAudioDevice is IHasVolumeDevice)
+                DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
+            CurrentVolumeControls = DefaultVolumeControls;
+
+
+            var leftDisp = LeftDisplay as DisplayBase;
+            if (leftDisp != null)
+                InitializeDisplay(leftDisp);
+
+            var rightDisp = RightDisplay as DisplayBase;
+            if (rightDisp != null)
+                InitializeDisplay(rightDisp);
+
+            // Get Microphone Privacy object, if any
+            this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
+
+            Debug.Console(2, this, "Microphone Privacy Config evaluated.");
+
+            // Get emergency object, if any
+            this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
+
+            Debug.Console(2, this, "Emergency Config evaluated.");
+
+            // Combines call feedback from both codecs if available
+            InCallFeedback = new BoolFeedback(() =>
+            {
+                bool inAudioCall = false;
+                bool inVideoCall = false;
+
+                if (AudioCodec != null)
+                    inAudioCall = AudioCodec.IsInCall;
+
+                if (VideoCodec != null)
+                    inVideoCall = VideoCodec.IsInCall;
+
+                if (inAudioCall || inVideoCall)
+                    return true;
+                else
+                    return false;
+            });
+
+            VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+
+            if (AudioCodec != null)
+                AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+
+            IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+            VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
+
+            // link privacy to VC (for now?)
+            PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
+            VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
+
+            CallTypeFeedback = new IntFeedback(() => 0);
+
+            SourceListKey = "default";
+            EnablePowerOnToLastSource = true;
+        }
+
+        void InitializeDisplay(DisplayBase disp)
+        {
+            if (disp != null)
+            {
+                // Link power, warming, cooling to display
+                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
+                    {
+                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                        {
+                            if (!disp.PowerIsOnFeedback.BoolValue)
+                                disp.CurrentSourceInfo = null;
+                            OnFeedback.FireUpdate();
+                        }
+                        if (disp.PowerIsOnFeedback.BoolValue)
+                        {
+                            SetDefaultLevels();
+                        }
+                    };
+
+                disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
+                {
+                    IsWarmingUpFeedback.FireUpdate();
+                    if (!IsWarmingUpFeedback.BoolValue)
+                        (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                };
+                disp.IsCoolingDownFeedback.OutputChange += (o, a) =>
+                {
+                    IsCoolingDownFeedback.FireUpdate();
+                };
+            }
+        }
+
+        protected override void CustomSetConfig(DeviceConfig config)
+        {
+            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsDualDisplayRoomPropertiesConfig>(config.Properties.ToString());
+
+            if (newPropertiesConfig != null)
+                PropertiesConfig = newPropertiesConfig;
+
+            ConfigWriter.UpdateRoomConfig(config);
+        }
+
+        public override bool CustomActivate()
+        {
+            // Add Occupancy object from config
+            if (PropertiesConfig.Occupancy != null)
+                this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
+                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
+
+            this.LogoUrl = PropertiesConfig.Logo.GetUrl();
+            this.SourceListKey = PropertiesConfig.SourceListKey;
+            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
+            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
+
+            return base.CustomActivate();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected override void EndShutdown()
+        {
+            VideoCodec.EndAllCalls();
+
+            SetDefaultLevels();
+
+            RunDefaultPresentRoute();
+
+            CrestronEnvironment.Sleep(1000);
+
+            RunRouteAction("roomOff");
+        }
+
+        /// <summary>
+        /// Routes the default source item, if any. Returns true when default route exists
+        /// </summary>
+        public override bool RunDefaultPresentRoute()
+        {
+            if (DefaultSourceItem != null)
+                RunRouteAction(DefaultSourceItem);
+
+            return DefaultSourceItem != null;
+        }
+
+        /// <summary>
+        /// Sets up the room when started into call mode without presenting a source
+        /// </summary>
+        /// <returns></returns>
+        public bool RunDefaultCallRoute()
+        {
+            RunRouteAction(DefaultCodecRouteString);
+            return true;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="routeKey"></param>
+        public void RunRouteAction(string routeKey)
+        {
+            RunRouteAction(routeKey, null);
+        }
+
+        /// <summary>
+        /// Gets a source from config list SourceListKey and dynamically build and executes the
+        /// route or commands
+        /// </summary>
+        /// <param name="name"></param>
+        public void RunRouteAction(string routeKey, Action successCallback)
+        {
+            // Run this on a separate thread
+            new CTimer(o =>
+            {
+                // try to prevent multiple simultaneous selections
+                SourceSelectLock.TryEnter();
+
+                try
+                {
+
+                    Debug.Console(1, this, "Run route action '{0}'", routeKey);
+                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
+                    if (dict == null)
+                    {
+                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
+                        return;
+                    }
+
+                    // Try to get the list item by it's string key
+                    if (!dict.ContainsKey(routeKey))
+                    {
+                        Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'",
+                            routeKey, SourceListKey);
+                        return;
+                    }
+
+                    // End usage timer on last source
+                    if (!string.IsNullOrEmpty(LastSourceKey))
+                    {
+                        var usageLastSource = dict[LastSourceKey].SourceDevice as IUsageTracking;
+                        if (usageLastSource != null && usageLastSource.UsageTracker != null)
+                        {
+                            try
+                            {
+                                // There MAY have been failures in here.  Protect
+                                usageLastSource.UsageTracker.EndDeviceUsage();
+                            }
+                            catch (Exception e)
+                            {
+                                Debug.Console(1, this, "*#* EXCEPTION in end usage tracking:\r{0}", e);
+                            }
+                        }
+                    }
+
+                    // Let's run it
+                    var item = dict[routeKey];
+                    if (routeKey.ToLower() != "roomoff")
+                    {
+
+                        LastSourceKey = routeKey;
+                    }
+                    //else
+                    //    CurrentSourceInfoKey = null;
+
+                    // hand off the individual routes to this helper
+                    foreach (var route in item.RouteList)
+                        DoRouteItem(route, item, routeKey);
+
+                    // Start usage timer on routed source
+                    var usageNewSource = item.SourceDevice as IUsageTracking;
+                    if (usageNewSource != null && usageNewSource.UsageTracker != null) // Have to make sure there is a usage tracker!
+                    {
+                        (item.SourceDevice as IUsageTracking).UsageTracker.StartDeviceUsage();
+                    }
+
+                    // See if this can be moved into common, base-class method -------------
+
+
+                    // Set volume control, using default if non provided
+                    IBasicVolumeControls volDev = null;
+                    // Handle special cases for volume control
+                    if (string.IsNullOrEmpty(item.VolumeControlKey)
+                        || item.VolumeControlKey.Equals("$defaultAudio", StringComparison.OrdinalIgnoreCase))
+                        volDev = DefaultVolumeControls;
+
+                    // Or a specific device, probably rarely used.
+                    else
+                    {
+                        var dev = DeviceManager.GetDeviceForKey(item.VolumeControlKey);
+                        if (dev is IBasicVolumeControls)
+                            volDev = dev as IBasicVolumeControls;
+                        else if (dev is IHasVolumeDevice)
+                            volDev = (dev as IHasVolumeDevice).VolumeDevice;
+                    }
+
+                    if (volDev != CurrentVolumeControls)
+                    {
+                        // zero the volume on the device we are leaving.  
+                        // Set the volume to default on device we are entering
+                        if (ZeroVolumeWhenSwtichingVolumeDevices && CurrentVolumeControls is IBasicVolumeWithFeedback)
+                        {
+                            var vd = CurrentVolumeControls as IBasicVolumeWithFeedback;
+                            SavedVolumeLevels[vd] = (uint)vd.VolumeLevelFeedback.IntValue;
+                            vd.SetVolume(0);
+                        }
+
+                        CurrentVolumeControls = volDev;
+                        if (ZeroVolumeWhenSwtichingVolumeDevices && CurrentVolumeControls is IBasicVolumeWithFeedback)
+                        {
+                            var vd = CurrentVolumeControls as IBasicVolumeWithFeedback;
+                            ushort vol = (SavedVolumeLevels.ContainsKey(vd) ? (ushort)SavedVolumeLevels[vd] : DefaultVolume);
+                            vd.SetVolume(vol);
+                        }
+                    }
+                    // -----------------------------------------------------------------------
+
+
+
+                    // store the name and UI info for routes
+                    if (item.SourceKey == "$off")
+                    {
+                        LeftDisplay.CurrentSourceInfoKey = routeKey;
+                        LeftDisplay.CurrentSourceInfo = null;
+                        RightDisplay.CurrentSourceInfoKey = routeKey;
+                        RightDisplay.CurrentSourceInfo = null;
+                    }
+                    //else if (item.SourceKey != null)
+                    //{
+                    //    if(item.RouteList
+                    //    CurrentSourceInfoKey = routeKey;
+                    //    CurrentSourceInfo = item;
+                    //}
+
+                    OnFeedback.FireUpdate();
+
+                    // report back when done
+                    if (successCallback != null)
+                        successCallback();
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(1, this, "ERROR in routing: {0}", e);
+                }
+
+                SourceSelectLock.Leave();
+            }, 0); // end of CTimer
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="route"></param>
+        void DoRouteItem(SourceRouteListItem route, SourceListItem sourceItem, string sourceItemKey)
+        {
+            // if there is a $defaultAll on route, run two separate
+            if (route.DestinationKey.Equals("$defaultAll", StringComparison.OrdinalIgnoreCase))
+            {
+                // Going to assume a single-path route for now
+                var tempVideo = new SourceRouteListItem
+                {
+                    DestinationKey = "$defaultDisplay",
+                    SourceKey = route.SourceKey,
+                    Type = eRoutingSignalType.Video
+                };
+                DoRoute(tempVideo, sourceItem, sourceItemKey);
+            }
+            else
+                DoRoute(route, sourceItem, sourceItemKey);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="route"></param>
+        /// <returns></returns>
+        bool DoRoute(SourceRouteListItem route, SourceListItem sourceItem, string sourceItemKey)
+        {
+            IRoutingSinkNoSwitching dest = null;
+
+            if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
+                dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
+            else if (route.DestinationKey.Equals(LeftDisplay.Key, StringComparison.OrdinalIgnoreCase))
+                dest = LeftDisplay;
+            else if (route.DestinationKey.Equals(RightDisplay.Key, StringComparison.OrdinalIgnoreCase))
+                dest = RightDisplay;
+            else
+                dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
+
+            if (dest == null)
+            {
+                Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
+                return false;
+            }
+
+            if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
+            {
+                dest.ReleaseRoute();
+
+
+
+                if (dest is IPower)
+                    (dest as IPower).PowerOff();
+            }
+            else
+            {
+                var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
+                if (source == null)
+                {
+                    Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
+                    return false;
+                }
+                dest.ReleaseAndMakeRoute(source, route.Type);
+
+                dest.CurrentSourceInfoKey = sourceItemKey;
+                dest.CurrentSourceInfo = sourceItem;
+            }
+            return true;
+        }
+
+        public override void RoomVacatedForTimeoutPeriod(object o)
+        {
+            //Implement this
+        }
+
+        /// <summary>
+        /// Does what it says
+        /// </summary>
+        public override void SetDefaultLevels()
+        {
+            Debug.Console(1, this, "Restoring default levels");
+            var vc = CurrentVolumeControls as IBasicVolumeWithFeedback;
+            if (vc != null)
+                vc.SetVolume(DefaultVolume);
+        }
+        /// <summary>
+        /// Will power the room on with the last-used source
+        /// </summary>
+        public override void PowerOnToDefaultOrLastSource()
+        {
+            if (!EnablePowerOnToLastSource || LastSourceKey == null)
+                return;
+            RunRouteAction(LastSourceKey);
+        }
+
+        /// <summary>
+        /// Runs "roomOff" action on all rooms not set to ExcludeFromGlobalFunctions
+        /// </summary>
+        public static void AllRoomsOff()
+        {
+            var allRooms = DeviceManager.AllDevices.Where(d =>
+                d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+            foreach (var room in allRooms)
+                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
+        }
+
+        #region IPrivacy Members
+
+
+        public void PrivacyModeOff()
+        {
+            VideoCodec.PrivacyModeOff();
+        }
+
+        public void PrivacyModeOn()
+        {
+            VideoCodec.PrivacyModeOn();
+        }
+
+        public void PrivacyModeToggle()
+        {
+            VideoCodec.PrivacyModeToggle();
+        }
+
+        #endregion
+    }
+}

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -13,10 +13,10 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-	public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls
+    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
+		public event SourceInfoChangeHandler CurrentSourceChange;
 
         protected override Func<bool> OnFeedbackFunc
         {
@@ -76,11 +76,6 @@ namespace PepperDash.Essentials
 
 		public bool ExcludeFromGlobalFunctions { get; set; }
 
-		/// <summary>
-		/// The config name of the source list
-		/// </summary>
-		public string SourceListKey { get; set; }
-
         public string DefaultSourceItem { get; set; }
 
         public ushort DefaultVolume { get; set; }
@@ -124,17 +119,17 @@ namespace PepperDash.Essentials
 		public SourceListItem CurrentSourceInfo
 		{
 			get { return _CurrentSourceInfo; }
-			private set
+			set
 			{
 				if (value == _CurrentSourceInfo) return;
 
-				var handler = CurrentSingleSourceChange;
+				var handler = CurrentSourceChange;
 				// remove from in-use tracker, if so equipped
 				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
 					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
 
 				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.WillChange);
+					handler(_CurrentSourceInfo, ChangeType.WillChange);
 
 				_CurrentSourceInfo = value;
 
@@ -142,12 +137,12 @@ namespace PepperDash.Essentials
 				if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
 					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
 				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.DidChange);
+					handler( _CurrentSourceInfo, ChangeType.DidChange);
 			}
 		}
 		SourceListItem _CurrentSourceInfo;
 
-        public string CurrentSourceInfoKey { get; private set; }
+        public string CurrentSourceInfoKey { get; set; }
 
         public EssentialsHuddleSpaceRoom(DeviceConfig config)
             : base(config)
@@ -251,7 +246,7 @@ namespace PepperDash.Essentials
             // Add Occupancy object from config
             if (PropertiesConfig.Occupancy != null)
                 this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                    PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
+                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
 
             this.LogoUrl = PropertiesConfig.Logo.GetUrl();
             this.SourceListKey = PropertiesConfig.SourceListKey;

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -16,11 +16,11 @@ using PepperDash.Essentials.Devices.Common.AudioCodec;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange, 
-		IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec
+    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange,
+        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
+		public event SourceInfoChangeHandler CurrentSourceChange;
 
 
         //************************
@@ -112,11 +112,6 @@ namespace PepperDash.Essentials
         public AudioCodecBase AudioCodec { get; private set; }
 
 		public bool ExcludeFromGlobalFunctions { get; set; }
-
-		/// <summary>
-		/// The config name of the source list
-		/// </summary>
-		public string SourceListKey { get; set; }
         
         public string DefaultSourceItem { get; set; }
 
@@ -162,17 +157,17 @@ namespace PepperDash.Essentials
 		public SourceListItem CurrentSourceInfo
 		{
 			get { return _CurrentSourceInfo; }
-			private set
+			set
 			{
 				if (value == _CurrentSourceInfo) return;
 
-				var handler = CurrentSingleSourceChange;
+				var handler = CurrentSourceChange;
 				// remove from in-use tracker, if so equipped
 				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
 					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
 
 				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.WillChange);
+					handler(_CurrentSourceInfo, ChangeType.WillChange);
 
 				_CurrentSourceInfo = value;
 
@@ -180,12 +175,12 @@ namespace PepperDash.Essentials
 				if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
 					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
 				if (handler != null)
-					handler(this, _CurrentSourceInfo, ChangeType.DidChange);
+					handler(_CurrentSourceInfo, ChangeType.DidChange);
 			}
 		}
 		SourceListItem _CurrentSourceInfo;
 
-        public string CurrentSourceInfoKey { get; private set; }
+        public string CurrentSourceInfoKey { get; set; }
 
         /// <summary>
         /// "codecOsd"
@@ -231,55 +226,26 @@ namespace PepperDash.Essentials
 
         void Initialize()
 		{
-            if (DefaultAudioDevice is IBasicVolumeControls)
-                DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
-            else if (DefaultAudioDevice is IHasVolumeDevice)
-                DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
-            CurrentVolumeControls = DefaultVolumeControls;
-			
-
-            var disp = DefaultDisplay as DisplayBase;
-            if (disp != null)
+            try
             {
-                // Link power, warming, cooling to display
-                disp.PowerIsOnFeedback.OutputChange += (o, a) =>
-                    {
-                        if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                        {
-                            if (!disp.PowerIsOnFeedback.BoolValue)
-                                CurrentSourceInfo = null;
-                            OnFeedback.FireUpdate();
-                        }
-                        if (disp.PowerIsOnFeedback.BoolValue)
-                        {
-                            SetDefaultLevels();
-                        }
-                    };
-
-                disp.IsWarmingUpFeedback.OutputChange += (o, a) => 
-                { 
-                    IsWarmingUpFeedback.FireUpdate();
-                    if (!IsWarmingUpFeedback.BoolValue)
-                        (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                };
-                disp.IsCoolingDownFeedback.OutputChange += (o, a) => 
-                {
-                    IsCoolingDownFeedback.FireUpdate(); 
-                };
-            }
+                if (DefaultAudioDevice is IBasicVolumeControls)
+                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
+                else if (DefaultAudioDevice is IHasVolumeDevice)
+                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
+                CurrentVolumeControls = DefaultVolumeControls;
 
 
-            // Combines call feedback from both codecs if available
-            InCallFeedback = new BoolFeedback(() => 
+                // Combines call feedback from both codecs if available
+                InCallFeedback = new BoolFeedback(() =>
                 {
                     bool inAudioCall = false;
                     bool inVideoCall = false;
 
-                    if(AudioCodec != null)
+                    if (AudioCodec != null)
                         inAudioCall = AudioCodec.IsInCall;
 
-                    if(VideoCodec != null)
-                        inVideoCall = AudioCodec.IsInCall;
+                    if (VideoCodec != null)
+                        inVideoCall = VideoCodec.IsInCall;
 
                     if (inAudioCall || inVideoCall)
                         return true;
@@ -287,22 +253,71 @@ namespace PepperDash.Essentials
                         return false;
                 });
 
-            VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                var disp = DefaultDisplay as DisplayBase;
+                if (disp != null)
+                {
+                    // Link power, warming, cooling to display
+                    disp.PowerIsOnFeedback.OutputChange += (o, a) =>
+                        {
+                            if (disp.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                            {
+                                if (!disp.PowerIsOnFeedback.BoolValue)
+                                    CurrentSourceInfo = null;
+                                OnFeedback.FireUpdate();
+                            }
+                            if (disp.PowerIsOnFeedback.BoolValue)
+                            {
+                                SetDefaultLevels();
+                            }
+                        };
 
-            if (AudioCodec != null)
-                AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                    disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
+                    {
+                        IsWarmingUpFeedback.FireUpdate();
+                        if (!IsWarmingUpFeedback.BoolValue)
+                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                    };
+                    disp.IsCoolingDownFeedback.OutputChange += (o, a) =>
+                    {
+                        IsCoolingDownFeedback.FireUpdate();
+                    };
 
-            IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
-            VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
+                }
 
-            // link privacy to VC (for now?)
-            PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-            VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
 
-            CallTypeFeedback = new IntFeedback(() => 0);
-          
-			SourceListKey = "default";
-			EnablePowerOnToLastSource = true;
+
+                // Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
+                this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
+
+                Debug.Console(2, this, "Microphone Privacy Config evaluated.");
+
+                // Get emergency object, if any
+                this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
+
+                Debug.Console(2, this, "Emergency Config evaluated.");
+
+
+                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+
+                if (AudioCodec != null)
+                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+
+                IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
+
+                // link privacy to VC (for now?)
+                PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
+
+                CallTypeFeedback = new IntFeedback(() => 0);
+
+                SourceListKey = "default";
+                EnablePowerOnToLastSource = true;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error Initializing Room: {0}", e);
+            }
    		}
 
         protected override void CustomSetConfig(DeviceConfig config)
@@ -320,19 +335,13 @@ namespace PepperDash.Essentials
             // Add Occupancy object from config
             if (PropertiesConfig.Occupancy != null)
                 this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                    PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
+                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
 
             this.LogoUrl = PropertiesConfig.Logo.GetUrl();
             this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 
-            // Get Microphone Privacy object, if any
-            this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
-
-            // Get emergency object, if any
-            this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
-
             return base.CustomActivate();
         }
 

PepperDashEssentials/Room/Types/EssentialsNDisplayRoomBase.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Room.Config;
+
+namespace PepperDash.Essentials
+{
+    /// <summary>
+    /// Base class for rooms with more than a single display
+    /// </summary>
+    public abstract class EssentialsNDisplayRoomBase : EssentialsRoomBase, IHasMultipleDisplays
+    {
+        //public event SourceInfoChangeHandler CurrentSingleSourceChange;
+
+        public Dictionary<eSourceListItemDestinationTypes, IRoutingSinkWithSwitching> Displays { get; protected set;}
+
+        public EssentialsNDisplayRoomBase(DeviceConfig config)
+            : base (config)
+        {
+            Displays = new Dictionary<eSourceListItemDestinationTypes, IRoutingSinkWithSwitching>();
+
+        }
+    }
+}

PepperDashEssentials/Room/Types/EssentialsPresentationRoom.cs

@@ -33,7 +33,7 @@
 //        public Dictionary<uint, IRoutingSinkNoSwitching> Displays { get; private set; }
 
 //        public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; }
-//        public IBasicVolumeControls DefaultVolumeControls { get; private set; }
+//        public IBasicVolumeControls DefaultVolumeControls { get; private set; }C:\Working Directories\PD\essentials\PepperDashEssentials\Room\Types\EssentialsPresentationRoom.cs
 
 //        /// <summary>
 //        /// The config name of the source list

PepperDashEssentials/UI/CrestronTouchpanelPropertiesConfig.cs

@@ -1,48 +0,0 @@
-namespace PepperDash.Essentials
-{
-	public class CrestronTouchpanelPropertiesConfig
-	{
-		public string IpId { get; set; }
-		public string DefaultRoomKey { get; set; }
-		public string RoomListKey { get; set; }
-		public string SgdFile { get; set; }
-        public string ProjectName { get; set; }
-		public bool ShowVolumeGauge { get; set; }
-		public bool UsesSplashPage { get; set; }
-		public bool ShowDate { get; set; }
-		public bool ShowTime { get; set; }
-        public UiSetupPropertiesConfig Setup { get; set; }
-        public string HeaderStyle { get; set; }
-        public bool IncludeInFusionRoomHealth { get; set; }
-
-
-        /// <summary>
-        /// The count of sources that will trigger the "additional" arrows to show on the SRL.
-        /// Defaults to 5
-        /// </summary>
-        public int SourcesOverflowCount { get; set; }
-
-        public CrestronTouchpanelPropertiesConfig()
-        {
-            SourcesOverflowCount = 5;
-			HeaderStyle = CrestronTouchpanelPropertiesConfig.Habanero;
-        }
-
-		/// <summary>
-		/// "habanero"
-		/// </summary>
-		public const string Habanero = "habanero";
-		/// <summary>
-		/// "verbose"
-		/// </summary>
-		public const string Verbose = "verbose";
-	}
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class UiSetupPropertiesConfig
-    {
-        public bool IsVisible { get; set; }
-    }
-}

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.PageManagers;
 
 namespace PepperDash.Essentials
 {
-	public class EssentialsTouchpanelController : Device
+    public class EssentialsTouchpanelController : Device, IHasBasicTriListWithSmartObject
 	{
 		public BasicTriListWithSmartObject Panel { get; private set; }
 
@@ -27,9 +27,22 @@ namespace PepperDash.Essentials
 		{
 			Panel = tsw;
 			tsw.LoadSmartObjects(sgdPath);
-			tsw.SigChange += new Crestron.SimplSharpPro.DeviceSupport.SigEventHandler(Tsw_SigChange);
+			tsw.SigChange += Panel_SigChange;
 		}
 
+        public EssentialsTouchpanelController(string key, string name, Dge100 dge, string projectName, string sgdPath)
+            : base(key, name)
+        {
+            Panel = dge;
+
+            if (!string.IsNullOrEmpty(sgdPath))
+                dge.LoadSmartObjects(sgdPath);
+            else
+                Debug.Console(1, this, "No SGD file path defined");
+
+            dge.SigChange += Panel_SigChange;
+        }
+
 		/// <summary>
 		/// Config constructor
 		/// </summary>
@@ -102,7 +115,7 @@ namespace PepperDash.Essentials
             }
 
             Panel.LoadSmartObjects(sgdName);
-            Panel.SigChange += Tsw_SigChange;
+            Panel.SigChange += Panel_SigChange;
 
 		}
 
@@ -158,7 +171,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void Tsw_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
+		void Panel_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args)
 		{
 			if (Debug.Level == 2)
 				Debug.Console(2, this, "Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);

PepperDashEssentials/UI/SubpageReferenceListSourceItem.cs

@@ -25,11 +25,11 @@ namespace PepperDash.Essentials
 
         public void RegisterForSourceChange(IHasCurrentSourceInfoChange room)
         {
-            room.CurrentSingleSourceChange -= room_CurrentSourceInfoChange;
-            room.CurrentSingleSourceChange += room_CurrentSourceInfoChange;
+            room.CurrentSourceChange -= room_CurrentSourceInfoChange;
+            room.CurrentSourceChange += room_CurrentSourceInfoChange;
         }
 
-        void room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+        void room_CurrentSourceInfoChange(SourceListItem info, ChangeType type)
         {
             if (type == ChangeType.WillChange && info == SourceItem)
                 ClearFeedback();

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -733,7 +733,7 @@ namespace PepperDash.Essentials
                 // Disconnect current room
                 _CurrentRoom.CurrentVolumeDeviceChange -= this.CurrentRoom_CurrentAudioDeviceChange;
                 ClearAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange -= this.CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange -= this.CurrentRoom_SourceInfoChange;
                 DisconnectSource(_CurrentRoom.CurrentSourceInfo);
                 _CurrentRoom.ShutdownPromptTimer.HasStarted -= ShutdownPromptTimer_HasStarted;
                 _CurrentRoom.ShutdownPromptTimer.HasFinished -= ShutdownPromptTimer_HasFinished;
@@ -803,7 +803,7 @@ namespace PepperDash.Essentials
 
                 _CurrentRoom.CurrentVolumeDeviceChange += CurrentRoom_CurrentAudioDeviceChange;
                 RefreshAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange += CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
                 (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);
@@ -1064,8 +1064,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// Handles source change
 		/// </summary>
-		void CurrentRoom_SourceInfoChange(EssentialsRoomBase room, 
-			SourceListItem info, ChangeType change)
+		void CurrentRoom_SourceInfoChange(SourceListItem info, ChangeType change)
 		{
 			if (change == ChangeType.WillChange)
 				DisconnectSource(info);

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -885,7 +885,7 @@ namespace PepperDash.Essentials
                 // Disconnect current room
                 _CurrentRoom.CurrentVolumeDeviceChange -= this.CurrentRoom_CurrentAudioDeviceChange;
                 ClearAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange -= this.CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange -= this.CurrentRoom_SourceInfoChange;
                 DisconnectSource(_CurrentRoom.CurrentSourceInfo);
                 _CurrentRoom.ShutdownPromptTimer.HasStarted -= ShutdownPromptTimer_HasStarted;
                 _CurrentRoom.ShutdownPromptTimer.HasFinished -= ShutdownPromptTimer_HasFinished;
@@ -924,10 +924,13 @@ namespace PepperDash.Essentials
 
                 _CurrentRoom.CurrentVolumeDeviceChange += CurrentRoom_CurrentAudioDeviceChange;
                 RefreshAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange += CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
-				(_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
+                if (_CurrentRoom.VideoCodec is IHasScheduleAwareness)
+                {
+                    (_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
+                }
 
                 CallSharingInfoVisibleFeedback = new BoolFeedback(() => _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue);
                 _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.OutputChange += SharingContentIsOnFeedback_OutputChange;
@@ -936,7 +939,7 @@ namespace PepperDash.Essentials
                 SetActiveCallListSharingContentStatus();
 
                 if (_CurrentRoom != null)
-                    _CurrentRoom.CurrentSingleSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
+                    _CurrentRoom.CurrentSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
 
                 TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd"));
 
@@ -1047,7 +1050,7 @@ namespace PepperDash.Essentials
         /// <param name="room"></param>
         /// <param name="info"></param>
         /// <param name="type"></param>
-        void CurrentRoom_CurrentSingleSourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+        void CurrentRoom_CurrentSingleSourceChange(SourceListItem info, ChangeType type)
         {
             if (_CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && _CurrentRoom.CurrentSourceInfo != null)
                 TriList.StringInput[UIStringJoin.CallSharedSourceNameText].StringValue = _CurrentRoom.CurrentSourceInfo.PreferredName;
@@ -1360,8 +1363,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Handles source change
         /// </summary>
-        void CurrentRoom_SourceInfoChange(EssentialsRoomBase room,
-            SourceListItem info, ChangeType change)
+        void CurrentRoom_SourceInfoChange(SourceListItem info, ChangeType change)
         {
             if (change == ChangeType.WillChange)
                 DisconnectSource(info);

PepperDashEssentials/UIDrivers/SmartObjectRoomsList.cs

@@ -64,11 +64,11 @@ namespace PepperDash.Essentials
 			parent.SetItemMainText(index, room.Name);
 			UpdateItem(room.CurrentSourceInfo);
 			// Watch for later changes
-			room.CurrentSingleSourceChange += new SourceInfoChangeHandler(room_CurrentSourceInfoChange);
+			room.CurrentSourceChange += new SourceInfoChangeHandler(room_CurrentSourceInfoChange);
 			parent.SetItemButtonAction(index, buttonAction);
 		}
 
-		void room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+		void room_CurrentSourceInfoChange(SourceListItem info, ChangeType type)
 		{
 			UpdateItem(info);
 		}

PepperDashEssentials/UIDrivers/SourceChangeArgs.cs

@@ -9,8 +9,8 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials
 {
-    /// <summary>
-    /// The handler type for a Room's SourceInfoChange
-    /// </summary>
-    public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
+    ///// <summary>
+    ///// The handler type for a Room's SourceInfoChange
+    ///// </summary>
+    //public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
 }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -58,16 +58,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
         SmartObjectDynamicList RecentCallsList;
 
 		SmartObjectDynamicList DirectoryList;
-
-		CodecDirectory CurrentDirectoryResult;
-
-        /// <summary>
-        /// Tracks the directory browse history when browsing beyond the root directory
-        /// </summary>
-        List<CodecDirectory> DirectoryBrowseHistory;
         
-        bool NextDirectoryResultIsFolderContents;
-
         BoolFeedback DirectoryBackButtonVisibleFeedback;
 
         // These are likely temp until we get a keyboard built
@@ -111,7 +102,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 SetupCallStagingPopover();
                 SetupDialKeypad();
                 ActiveCallsSRL = new SubpageReferenceList(triList, UISmartObjectJoin.CodecActiveCallsHeaderList, 5,5,5);
-                SetupDirectoryList();
                 SetupRecentCallsList();
                 SetupFavorites();
                 SetupLayoutControls();
@@ -169,12 +159,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 });
                 SearchStringFeedback.LinkInputSig(triList.StringInput[UIStringJoin.CodecDirectorySearchEntryText]);
 
+                SetupDirectoryList();
+
                 SearchStringBackspaceVisibleFeedback = new BoolFeedback(() => SearchStringBuilder.Length > 0);
                 SearchStringBackspaceVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackspaceVisible]);
 
                 triList.SetSigFalseAction(UIBoolJoin.VCDirectoryBackPress, GetDirectoryParentFolderContents);
 
-                DirectoryBackButtonVisibleFeedback = new BoolFeedback(() => CurrentDirectoryResult != (codec as IHasDirectory).DirectoryRoot);
+                DirectoryBackButtonVisibleFeedback = (codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot;
                 DirectoryBackButtonVisibleFeedback
                     .LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackVisible]);
 
@@ -532,8 +524,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// </summary>
 		void SetupDirectoryList()
 		{
-            DirectoryBrowseHistory = new List<CodecDirectory>();
-
 			var codec = Codec as IHasDirectory;
 			if (codec != null)
 			{
@@ -548,28 +538,20 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
 				}
 
-
-				// If there is something here now, show it otherwise wait for the event
-				if (CurrentDirectoryResult != null && codec.DirectoryRoot.DirectoryResults.Count > 0)
-				{
-					RefreshDirectory();
-				}
+			    RefreshDirectory();
+				
 			}
 		}
 
         /// <summary>
-        /// Sets the current directory resutls to the DirectorRoot and updates Back Button visibiltiy
+        /// Sets the current directory results to the DirectoryRoot and updates Back Button visibiltiy
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            DirectoryBrowseHistory.Clear();
-
-            CurrentDirectoryResult = (Codec as IHasDirectory).DirectoryRoot;
+            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
 
             SearchKeypadClear();
 
-            DirectoryBackButtonVisibleFeedback.FireUpdate();
-
             RefreshDirectory();
         }
 
@@ -584,10 +566,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             SetCurrentDirectoryToRoot();
 
-            if (CurrentDirectoryResult != null && codec.DirectoryRoot.DirectoryResults.Count > 0)
-            {
-                RefreshDirectory();
-            }
+            RefreshDirectory();
+            
         }
 
 		/// <summary>
@@ -597,13 +577,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-            if (NextDirectoryResultIsFolderContents)
-            {
-                NextDirectoryResultIsFolderContents = false;
-                DirectoryBrowseHistory.Add(e.Directory);
-            }
-			CurrentDirectoryResult = e.Directory;
-            DirectoryBackButtonVisibleFeedback.FireUpdate();
+
 			RefreshDirectory();
 		}
 
@@ -615,7 +589,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             (Codec as IHasDirectory).GetDirectoryFolderContents(folder.FolderId);
 
-            NextDirectoryResultIsFolderContents = true;
         }
 
         /// <summary>
@@ -625,18 +598,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            if (DirectoryBrowseHistory.Count > 0)
+            if (codec != null)
             {
-                var lastItemIndex = DirectoryBrowseHistory.Count - 1;
-                CurrentDirectoryResult = DirectoryBrowseHistory[lastItemIndex];
-                DirectoryBrowseHistory.Remove(DirectoryBrowseHistory[lastItemIndex]);
+                codec.GetDirectoryParentFolderContents();
 
-                RefreshDirectory();
-            }
-            else
-            {
-                SetCurrentDirectoryToRoot();
+                //RefreshDirectory();
             }
+ 
         }
 
 		/// <summary>
@@ -645,10 +613,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="dir"></param>
 		void RefreshDirectory()
 		{
-            if (CurrentDirectoryResult.DirectoryResults.Count > 0)
+            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in CurrentDirectoryResult.DirectoryResults)
+                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -725,13 +693,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 Parent.MeetingOrContactMethodModalSrl.StringInputSig(i, 4).StringValue = "";
                 Parent.MeetingOrContactMethodModalSrl.StringInputSig(i, 5).StringValue = "Connect";
                 Parent.MeetingOrContactMethodModalSrl.BoolInputSig(i, 2).BoolValue = true;
-                var cc = c; // lambda scope
+                var cc = c; // to maintian lambda scope
                 Parent.MeetingOrContactMethodModalSrl.GetBoolFeedbackSig(i, 1).SetSigFalseAction(() =>
                 {
                     Parent.PopupInterlock.Hide();
                     var codec = Codec as VideoCodecBase;
                     if (codec != null)
-                        codec.Dial(c.Number);
+                        codec.Dial(cc.Number);
                 });
             }
             Parent.MeetingOrContactMethodModalSrl.Count = i;
@@ -744,10 +712,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupLayoutControls()
 		{
 			TriList.SetSigFalseAction(UIBoolJoin.VCStagingSelfViewLayoutPress, this.ShowSelfViewLayout);
-			var svc = Codec as IHasCodecSelfview;
+			var svc = Codec as IHasCodecSelfView;
 			if (svc != null)
 			{
-				TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewTogglePress, svc.SelfviewModeToggle);
+				TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewTogglePress, svc.SelfViewModeToggle);
 				svc.SelfviewIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCSelfViewTogglePress]);
 			}
 			var lc = Codec as IHasCodecLayouts;
@@ -1102,7 +1070,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
             SearchStringFeedback.FireUpdate();
             SearchStringKeypadCheckEnables();
 
-            if(CurrentDirectoryResult != (Codec as IHasDirectory).DirectoryRoot)
+            if ((Codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
                 SetCurrentDirectoryToRoot();
         }
 

README.md

@@ -0,0 +1,13 @@
+# Pepperdash Essentials
+
+## RELEASE PROCESS CONTROLLED BY JENKINS CI PROCESS
+
+#### How to merge
+
+
+
+- Make changes
+- Build
+- Test on your system
+- Commit and push to essentials
+- Curse a whole lot when you try to figure out how to then get developments all synced up

devjson commands.json

@@ -34,4 +34,10 @@ devjson:3 {"deviceKey":"room1.RoomOccupancy.RoomIsOccupiedFeedback","methodName"
 
 devjson:2 {"deviceKey":"codec-comms-ssh", "methodName":"SendText", "params": ["xcommand dial number: 10.11.50.211\r"]}
 
-devjson:2 {"deviceKey":"codec-comms-ssh", "methodName":"Connect", "params": []}
+devjson:2 {"deviceKey":"codec-comms-ssh", "methodName":"Connect", "params": []}
+
+devjson:1 {"deviceKey":"commBridge", "methodName":"ExecuteJoinAction", "params":[ 301, "digital", true ]}
+
+devjson:2 {"deviceKey":"display01Comm-com", "methodName":"SendText", "params": [ "I'M GETTING TIRED OF THIS" ]}
+
+devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []}

essentials-framework/Essentials Core/PepperDashEssentialsBase.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", "PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CecPortController.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public class CecPortController : Device, IBasicCommunication
+    {
+        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+        public bool IsConnected { get { return true; } }
+
+        ICec Port;
+
+        public CecPortController(string key, ICec port)
+            : base(key)
+        {
+            Port = port;
+
+            Port.StreamCec.CecChange += new CecChangeEventHandler(StreamCec_CecChange);
+        }
+
+        void StreamCec_CecChange(Cec cecDevice, CecEventArgs args)
+        {
+            if (args.EventId == CecEventIds.CecMessageReceivedEventId)
+                OnDataReceived(cecDevice.Received.StringValue);
+            else if (args.EventId == CecEventIds.ErrorFeedbackEventId)
+                if(cecDevice.ErrorFeedback.BoolValue)
+                    Debug.Console(2, this, "CEC NAK Error");
+        }
+
+        void OnDataReceived(string s)
+        {
+            var bytesHandler = BytesReceived;
+            if (bytesHandler != null)
+            {
+                var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+            }
+            var textHandler = TextReceived;
+            if (textHandler != null)
+                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+        }
+
+        #region IBasicCommunication Members
+
+        public void SendText(string text)
+        {
+            if (Port == null)
+                return;
+            Port.StreamCec.Send.StringValue = text;
+        }
+
+        public void SendBytes(byte[] bytes)
+        {
+            if (Port == null)
+                return;
+            var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+            Port.StreamCec.Send.StringValue = text;
+        }
+
+        public void Connect()
+        {
+        }
+
+        public void Disconnect()
+        {
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="s"></param>
+        public void SimulateReceive(string s)
+        {
+            // split out hex chars and build string
+            var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
+            StringBuilder b = new StringBuilder();
+            foreach (var t in split)
+            {
+                if (t.StartsWith(@"\") && t.Length == 4)
+                    b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
+                else
+                    b.Append(t);
+            }
+
+            OnDataReceived(b.ToString());
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/ComPortController.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+	public class ComPortController : Device, IBasicCommunication
+	{
+		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+		public bool IsConnected { get { return true; } }
+
+		ComPort Port;
+		ComPort.ComPortSpec Spec;
+
+		public ComPortController(string key, ComPort port, ComPort.ComPortSpec spec)
+			: base(key)
+		{
+			if (port == null)
+			{
+				Debug.Console(0, this,  "ERROR: Invalid com port, continuing but comms will not function");
+				return;
+			}
+
+			Port = port;
+			Spec = spec;
+			//IsConnected = new BoolFeedback(CommonBoolCue.IsConnected, () => true);
+
+			if (Port.Parent is CrestronControlSystem)
+			{
+
+
+				var result = Port.Register();
+				if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+				{
+					Debug.Console(0, this, "ERROR: Cannot register Com port: {0}", result);
+					return; // false
+				}
+			}
+			var specResult = Port.SetComPortSpec(Spec);
+			if (specResult != 0)
+			{
+				Debug.Console(0, this, "WARNING: Cannot set comspec");
+				return; // false
+			}
+			Port.SerialDataReceived += new ComPortDataReceivedEvent(Port_SerialDataReceived);
+		}
+
+		~ComPortController()
+		{
+			Port.SerialDataReceived -= Port_SerialDataReceived;
+		}
+
+		void Port_SerialDataReceived(ComPort ReceivingComPort, ComPortSerialDataEventArgs args)
+		{
+            OnDataReceived(args.SerialData);
+		}
+
+        void OnDataReceived(string s)
+        {
+            var bytesHandler = BytesReceived;
+            if (bytesHandler != null)
+            {
+                var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+            }
+            var textHandler = TextReceived;
+            if (textHandler != null)
+                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+        }
+
+		public override bool Deactivate()
+		{
+			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
+		}
+
+		#region IBasicCommunication Members
+
+		public void SendText(string text)
+		{
+			if (Port == null)
+				return;
+			Port.Send(text);
+		}
+
+		public void SendBytes(byte[] bytes)
+		{
+			if (Port == null)
+				return;
+			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+			Port.Send(text);
+		}
+
+		public void Connect()
+		{		
+		}
+
+		public void Disconnect()
+		{
+		}
+
+		#endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="s"></param>
+        public void SimulateReceive(string s)
+        {
+            // split out hex chars and build string
+            var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
+            StringBuilder b = new StringBuilder();
+            foreach (var t in split)
+            {
+                if (t.StartsWith(@"\") && t.Length == 4)
+                    b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
+                else
+                    b.Append(t);
+            }
+
+            OnDataReceived(b.ToString());
+        }
+	}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/ComSpecJsonConverter.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// This converter creates a proper ComPort.ComPortSpec struct from more-friendly JSON values.  It uses
+    /// ComSpecPropsJsonConverter to finish the individual properties.
+    /// </summary>
+    public class ComSpecJsonConverter : JsonConverter
+    {
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (objectType == typeof(ComPort.ComPortSpec))
+            {
+                var newSer = new JsonSerializer();
+                newSer.Converters.Add(new ComSpecPropsJsonConverter());
+                newSer.ObjectCreationHandling = ObjectCreationHandling.Replace;
+                return newSer.Deserialize<ComPort.ComPortSpec>(reader);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(ComPort.ComPortSpec);
+        }
+
+        public override bool CanRead { get { return true; } }
+
+        /// <summary>
+        /// This converter will not be used for writing
+        /// </summary>
+        public override bool CanWrite { get { return false; } }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    /// <summary>
+    /// The gist of this converter: The comspec JSON comes in with normal values that need to be converted
+    /// into enum names.  This converter takes the value and applies the appropriate enum's name prefix to the value
+    /// and then returns the enum value using Enum.Parse. NOTE: Does not write
+    /// </summary>
+    public class ComSpecPropsJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(ComPort.eComBaudRates)
+                || objectType == typeof(ComPort.eComDataBits)
+                || objectType == typeof(ComPort.eComParityType)
+                || objectType == typeof(ComPort.eComHardwareHandshakeType)
+                || objectType == typeof(ComPort.eComSoftwareHandshakeType)
+                || objectType == typeof(ComPort.eComProtocolType)
+                || objectType == typeof(ComPort.eComStopBits);
+        }
+
+        public override bool CanRead { get { return true; } }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            //Debug.Console(2, "ReadJson type: " + objectType.Name);
+            if (objectType == typeof(ComPort.eComBaudRates))
+                return Enum.Parse(typeof(ComPort.eComBaudRates), "ComspecBaudRate" + reader.Value, false);
+            else if (objectType == typeof(ComPort.eComDataBits))
+                return Enum.Parse(typeof(ComPort.eComDataBits), "ComspecDataBits" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComHardwareHandshakeType))
+                return Enum.Parse(typeof(ComPort.eComHardwareHandshakeType), "ComspecHardwareHandshake" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComParityType))
+                return Enum.Parse(typeof(ComPort.eComParityType), "ComspecParity" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComProtocolType))
+                return Enum.Parse(typeof(ComPort.eComProtocolType), "ComspecProtocol" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComSoftwareHandshakeType))
+                return Enum.Parse(typeof(ComPort.eComSoftwareHandshakeType), "ComspecSoftwareHandshake" + reader.Value, true);
+            else if (objectType == typeof(ComPort.eComStopBits))
+                return Enum.Parse(typeof(ComPort.eComStopBits), "ComspecStopBits" + reader.Value, true);
+            return null;
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+
+}