Merged in maintenance/pr-3 (pull request #32)

Maintenance/pr 3

Approved-by: Neil Dorin <ndorin@pepperdash.com>

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -9,25 +9,27 @@ 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)
 		{
-			var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as AirMediaControllerJoinMap;
+            AirMediaControllerJoinMap joinMap = new AirMediaControllerJoinMap();
 
-			if (joinMap == null)
-			{
-				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 Bridge Type {0}", airMedia.GetType().Name.ToString());
+			Debug.Console(0, "Linking to Airmedia: {0}", airMedia.Name);
 
-			trilist.StringInput[joinMap.Name].StringValue = airMedia.GetType().Name.ToString();			
+			trilist.StringInput[joinMap.Name].StringValue = airMedia.Name;			
 
 			var commMonitor = airMedia as ICommunicationMonitor;
             if (commMonitor != null)
@@ -55,68 +57,5 @@ namespace PepperDash.Essentials.Bridges
             airMedia.HostnameFeedback.LinkInputSig(trilist.StringInput[joinMap.HostnameFB]);
             airMedia.SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback]);
 		}
-
-	}
-	public class AirMediaControllerJoinMap : JoinMapBase
-	{
-        // Digital
-        public uint IsOnline { get; set; }
-        public uint IsInSession { get; set; }
-        public uint HdmiVideoSync { get; set; }
-        public uint AutomaticInputRoutingEnabled { get; set; }
-
-        // Analog
-        public uint VideoOut { get; set; }
-        public uint ErrorFB { get; set; }
-        public uint NumberOfUsersConnectedFB { get; set; }
-        public uint LoginCode { get; set; }
-
-        // Serial
-        public uint Name { get; set; }
-        public uint ConnectionAddressFB { get; set; }
-        public uint HostnameFB { get; set; }
-        public uint SerialNumberFeedback { get; set; }
-
-
-		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/AppleTvBridge.cs

@@ -9,18 +9,20 @@ 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)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as AppleTvJoinMap;
+            AppleTvJoinMap joinMap = new AppleTvJoinMap();
 
-            if (joinMap == null)
-            {
-                joinMap = new AppleTvJoinMap();
-            }
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if(!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<AppleTvJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -36,40 +38,4 @@ namespace PepperDash.Essentials.Bridges
             trilist.SetBoolSigAction(joinMap.PlayPause, (b) => appleTv.Play(b));
         }
     }
-
-    public class AppleTvJoinMap : JoinMapBase
-    {
-        // Digital
-        public uint UpArrow { get; set; }
-        public uint DnArrow { get; set; }
-        public uint LeftArrow { get; set; }
-        public uint RightArrow { get; set; }
-        public uint Menu { get; set; }
-        public uint Select { get; set; }
-        public uint PlayPause { get; set; }
-
-        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/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;
@@ -77,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;
@@ -87,11 +93,11 @@ 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 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);
@@ -107,6 +113,11 @@ namespace PepperDash.Essentials.Bridges
                             (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);
@@ -132,21 +143,21 @@ namespace PepperDash.Essentials.Bridges
                             (device as AppleTV).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-                        else if (device is IBridge)
+                        else if (device is HdMdxxxCEController)
                         {
-                            (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            (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 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;
-						//}
                     }
                 }
 

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

@@ -8,123 +8,139 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common;
 
+using Newtonsoft.Json;
+
+
 namespace PepperDash.Essentials.Bridges
 {
 	public static class DisplayControllerApiExtensions
 	{
-
-		public static int InputNumber;
-		public static IntFeedback InputNumberFeedback;
-		public static List<string> InputKeys = new List<string>();
 		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>();
 
-				var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DisplayControllerJoinMap;
+            DisplayControllerJoinMap joinMap = new DisplayControllerJoinMap();
 
-				if (joinMap == null)
+            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, () =>
 				{
-					joinMap = new DisplayControllerJoinMap();
-				}
-
-				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());
-
-                trilist.StringInput[joinMap.Name].StringValue = displayDevice.GetType().Name.ToString();			
-
-				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>(PowerIsOnFeedback_OutputChange);
-				displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
-
-				// PowerOn
-				trilist.SetSigTrueAction(joinMap.PowerOn, () =>
-					{
-						InputNumber = 0;
-						InputNumberFeedback.FireUpdate();
-						displayDevice.PowerOn();
-					});
-
-				
-				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); });
-                    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++;
-				}
-
-                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();
-
-					}
-                    if (twoWayDisplay != null)
-					    InputNumberFeedback.FireUpdate();
+					inputNumber = 102;
+					inputNumberFeedback.FireUpdate();
+					displayDevice.PowerOff();
 				});
 
-
-                var volumeDisplay = displayDevice as IBasicVolumeControls;
-                if (volumeDisplay != null)
+			displayDevice.PowerIsOnFeedback.OutputChange += new EventHandler<FeedbackEventArgs>( (o,a) => {
+                if (!a.BoolValue)
                 {
-                    trilist.SetBoolSigAction(joinMap.VolumeUp, (b) => volumeDisplay.VolumeUp(b));
-                    trilist.SetBoolSigAction(joinMap.VolumeDown, (b) => volumeDisplay.VolumeDown(b));
-                    trilist.SetSigTrueAction(joinMap.VolumeMute, () => volumeDisplay.MuteToggle());
+                    inputNumber = 102;
+                    inputNumberFeedback.FireUpdate();
 
-                    var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
-                    if(volumeDisplayWithFeedback != null)
-                    {
-                        volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevelFB]);
-                        volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute]);
-                    }
                 }
+                else
+                {
+                    inputNumber = 0;
+                    inputNumberFeedback.FireUpdate();
+                }
+            });
+
+			displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
+
+			// PowerOn
+			trilist.SetSigTrueAction(joinMap.PowerOn, () =>
+				{
+					inputNumber = 0;
+					inputNumberFeedback.FireUpdate();
+					displayDevice.PowerOn();
+				});
+
+			
+			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); });
+                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++;
 			}
 
+            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();
+
+				}
+                if (twoWayDisplay != null)
+				    inputNumberFeedback.FireUpdate();
+			});
+
+
+            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());
+
+                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)
 		{
 
@@ -132,91 +148,6 @@ namespace PepperDash.Essentials.Bridges
 
 		}
 
-		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
-	{
-        // Digital
-        public uint PowerOff { get; set; }
-        public uint PowerOn { get; set; }
-        public uint IsTwoWayDisplay { get; set; }
-        public uint VolumeUp { get; set; }
-        public uint VolumeDown { get; set; }
-        public uint VolumeMute { get; set; }
-        public uint InputSelectOffset { get; set; }
-		public uint ButtonVisibilityOffset { get; set; }
-        public uint IsOnline { get; set; }
-
-        // Analog
-        public uint InputSelect { get; set; }
-        public uint VolumeLevelFB { get; set; }
-
-        // Serial
-        public uint Name { get; set; }
-        public uint InputNamesOffset { get; set; }
-
-
-		public DisplayControllerJoinMap()
-		{
-			// Digital
-			IsOnline = 50;
-			PowerOff = 1;
-			PowerOn = 2;
-            IsTwoWayDisplay = 3;
-            VolumeUp = 5;
-            VolumeDown = 6;
-            VolumeMute = 7;
-
-			ButtonVisibilityOffset = 40;
-            InputSelectOffset = 10;
-
-			// Analog
-            InputSelect = 11;
-            VolumeLevelFB = 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;
-            VolumeLevelFB = VolumeLevelFB + joinOffset;
-		}
 	}
+   
 }

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -12,16 +12,21 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Bridges
 {
-    public static class DmChassisControllerApiExtentions 
+    public static class DmChassisControllerApiExtentions
     {
         public static void LinkToApi(this DmChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmChassisControllerJoinMap;
+            DmChassisControllerJoinMap joinMap = new DmChassisControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new DmChassisControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmChassisControllerJoinMap>(joinMapSerialized);
+            
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -46,13 +51,13 @@ namespace PepperDash.Essentials.Bridges
                 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];
+                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 txDevice = basicTxDevice as DmTxControllerBase;
+                    var txDevice = basicTxDevice as DmTxControllerBase;
 
                     if (dmChassis.Chassis is DmMd8x8Cpu3 || dmChassis.Chassis is DmMd8x8Cpu3rps
                         || dmChassis.Chassis is DmMd16x16Cpu3 || dmChassis.Chassis is DmMd16x16Cpu3rps
@@ -68,18 +73,20 @@ namespace PepperDash.Essentials.Bridges
                         }
                     }
 
-                    if(basicTxDevice != null && txDevice == null)
+                    if (basicTxDevice != null && txDevice == null)
                         trilist.BooleanInput[joinMap.TxAdvancedIsPresent + ioSlot].BoolValue = true;
 
 
                     if (txDevice != null)
                     {
-                        txDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
+                        txDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
                     }
                     else
                     {
+                        dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
+
                         var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
-                        if(inputPort != null)
+                        if (inputPort != null)
                         {
                             var hdmiInPort = inputPort.Port;
 
@@ -101,23 +108,28 @@ namespace PepperDash.Essentials.Bridges
                             }
                         }
                     }
-				}
-				else
-				{
-					dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
-
-                    var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}-hdmiIn", ioSlot)].Port as EndpointHdmiInput;
+                }
+                else
+                {
+                    dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
 
+                    var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
                     if (inputPort != null)
                     {
-                        //trilist.SetUShortSigAction((joinMap.HdcpSupport + ioSlot), u => 
+                        var hdmiPort = inputPort.Port as EndpointHdmiInput;
+
+                        if (hdmiPort != null)
+                        {
+                            SetHdcpCapabilityAction(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;
+                }
+                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;
                     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)
@@ -128,14 +140,14 @@ namespace PepperDash.Essentials.Bridges
                     {
                         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.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]);
@@ -198,88 +210,5 @@ namespace PepperDash.Essentials.Bridges
             }
         }
 
-        public class DmChassisControllerJoinMap : JoinMapBase
-        {
-            //Digital
-            public uint SystemId { get; set; }
-            public uint IsOnline { get; set; }
-            public uint OutputUsb { get; set; }
-            public uint InputUsb { get; set; }
-            public uint VideoSyncStatus { get; set; }
-            public uint InputEndpointOnline { get; set; }
-            public uint OutputEndpointOnline { get; set; }
-            public uint TxAdvancedIsPresent { get; set; } // indicates that there is an attached transmitter that should be bridged to be interacted with
-
-            //Analog
-            public uint OutputVideo { get; set; }
-            public uint OutputAudio { get; set; }
-            public uint HdcpSupportState { get; set; }
-            public uint HdcpSupportCapability { get; set; }
-
-            //SErial
-            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 DmChassisControllerJoinMap()
-            {
-                SystemId = 10;
-                //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
-                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
-                HdcpSupportState = 1000; //1001-1199
-                HdcpSupportCapability = 1200; //1201-1399
-
-
-            }
-
-            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/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);
 
@@ -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

@@ -10,16 +10,20 @@ 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)
         {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmpsRoutingControllerJoinMap;
+            DmpsRoutingControllerJoinMap joinMap = new DmpsRoutingControllerJoinMap();
 
-            if (joinMap == null)
-                joinMap = new DmpsRoutingControllerJoinMap();
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -120,58 +124,5 @@ namespace PepperDash.Essentials.Bridges
                     dmpsRouter.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
             }
         }
-
-
-        public class DmpsRoutingControllerJoinMap : JoinMapBase
-        {
-            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 DmpsRoutingControllerJoinMap()
-            {;
-                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;
-
-                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;
-            }
-        }
     }
 }

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/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/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/DmChassisControllerJoinMap.cs

@@ -0,0 +1,147 @@
+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
+            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;
+
+            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/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

@@ -365,7 +365,10 @@ namespace PepperDash.Essentials
                 Debug.Console(2, "Adding DmpsRoutingController for {0} to Device Manager.", this.ControllerPrompt);
 
                 var dmpsRoutingController = DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, new DM.Config.DmpsRoutingPropertiesConfig());
+
                 DeviceManager.AddDevice(dmpsRoutingController);
+
+
             }
             else
             {

PepperDashEssentials/PepperDashEssentials.csproj

@@ -121,6 +121,7 @@
     <Compile Include="Bridges\BridgeFactory.cs" />
     <Compile Include="Bridges\CameraControllerBridge.cs" />
     <Compile Include="Bridges\AirMediaControllerBridge.cs" />
+    <Compile Include="Bridges\DmpsAudioOutputControllerBridge.cs" />
     <Compile Include="Bridges\DmpsRoutingControllerBridge.cs" />
     <Compile Include="Bridges\DisplayControllerBridge.cs" />
     <Compile Include="Bridges\DigitalLoggerBridge.cs" />
@@ -128,11 +129,27 @@
     <Compile Include="Bridges\DmTxControllerBridge.cs" />
     <Compile Include="Bridges\GenericLightingBridge.cs" />
     <Compile Include="Bridges\GenericRelayDeviceBridge.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\SystemMonitorJoinMap.cs" />
     <Compile Include="Bridges\SystemMonitorBridge.cs" />
     <Compile Include="Configuration ORIGINAL\Builders\TPConfig.cs" />
     <Compile Include="Configuration ORIGINAL\Configuration.cs" />

devjson commands.json

@@ -38,4 +38,6 @@ 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: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/Config/BasicConfig.cs

@@ -26,6 +26,9 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("tieLines")]
 		public List<TieLineConfig> TieLines { get; set; }
 
+        [JsonProperty("joinMaps")]
+        public Dictionary<string, string> JoinMaps { get; set; }
+
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
 		/// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs

@@ -4,23 +4,30 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Essentials.Bridges
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
 {
     public static class JoinMapHelper
     {
         /// <summary>
-        /// Attempts to get the join map from config
+        /// Attempts to get the serialized join map from config
         /// </summary>
         /// <param name="joinMapKey"></param>
         /// <returns></returns>
-        public static JoinMapBase GetJoinMapForDevice(string joinMapKey)
+        public static string GetJoinMapForDevice(string joinMapKey)
         {
-            if (!string.IsNullOrEmpty(joinMapKey))
+            if (string.IsNullOrEmpty(joinMapKey))
                 return null;
 
-            // FUTURE TODO: Get the join map from the ConfigReader.ConfigObject 
+            var joinMap = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
 
-            return null;
+            if (joinMap != null)
+            {
+                return joinMap;
+            }
+            else
+                return null;
         }
     }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -1,265 +1,266 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials.Core</RootNamespace>
-    <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
-    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
-    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
-    <OSVersion>5.0</OSVersion>
-    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <NativePlatformName>Windows CE</NativePlatformName>
-    <FormFactorID>
-    </FormFactorID>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.1.26313, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
-    </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>
-      <Private>False</Private>
-    </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>
-      <Private>False</Private>
-    </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>
-    </Reference>
-    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
-      <Private>False</Private>
-    </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>
-    </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>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Comm and IR\CecPortController.cs" />
-    <Compile Include="Comm and IR\GenericComm.cs" />
-    <Compile Include="Config\Essentials\ConfigUpdater.cs" />
-    <Compile Include="Config\Essentials\ConfigReader.cs" />
-    <Compile Include="Config\Essentials\ConfigWriter.cs" />
-    <Compile Include="Config\Essentials\EssentialsConfig.cs" />
-    <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
-    <Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
-    <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
-    <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
-    <Compile Include="Crestron IO\IOPortConfig.cs" />
-    <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
-    <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
-    <Compile Include="Devices\CodecInterfaces.cs" />
-    <Compile Include="Devices\CrestronProcessor.cs" />
-    <Compile Include="Devices\DeviceApiBase.cs" />
-    <Compile Include="Devices\ReconfigurableDevice.cs" />
-    <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="Factory\DeviceFactory.cs" />
-    <Compile Include="Feedbacks\BoolFeedback.cs" />
-    <Compile Include="Feedbacks\FeedbackCollection.cs" />
-    <Compile Include="Feedbacks\FeedbackEventArgs.cs" />
-    <Compile Include="Feedbacks\IntFeedback.cs" />
-    <Compile Include="Feedbacks\SerialFeedback.cs" />
-    <Compile Include="Feedbacks\StringFeedback.cs" />
-    <Compile Include="Global\JobTimer.cs" />
-    <Compile Include="Global\Scheduler.cs" />
-    <Compile Include="Lighting\Lighting Interfaces.cs" />
-    <Compile Include="Lighting\LightingBase.cs" />
-    <Compile Include="Monitoring\SystemMonitorController.cs" />
-    <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
-    <Compile Include="Comm and IR\CommFactory.cs" />
-    <Compile Include="Comm and IR\CommunicationExtras.cs" />
-    <Compile Include="Comm and IR\ComSpecJsonConverter.cs" />
-    <Compile Include="Comm and IR\ConsoleCommMockDevice.cs" />
-    <Compile Include="Comm and IR\IRPortHelper.cs" />
-    <Compile Include="Config\BasicConfig.cs" />
-    <Compile Include="Config\ConfigPropertiesHelpers.cs" />
-    <Compile Include="Config\InfoConfig.cs" />
-    <Compile Include="Config\DeviceConfig.cs" />
-    <Compile Include="Constants\CommonCues.cs" />
-    <Compile Include="Devices\DisplayUiConstants.cs" />
-    <Compile Include="Devices\IUsageTracking.cs" />
-    <Compile Include="Devices\DeviceJsonApi.cs" />
-    <Compile Include="Devices\SourceListItem.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDisplayBasic.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDumbSource.cs" />
-    <Compile Include="DeviceTypeInterfaces\IWarmingCooling.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDiscPlayerControls.cs" />
-    <Compile Include="DeviceTypeInterfaces\IPower.cs" />
-    <Compile Include="DeviceTypeInterfaces\IUiDisplayInfo.cs" />
-    <Compile Include="DeviceTypeInterfaces\ISetTopBoxControls.cs" />
-    <Compile Include="DeviceTypeInterfaces\IChannel.cs" />
-    <Compile Include="DeviceTypeInterfaces\IColorFunctions.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDPad.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDvr.cs" />
-    <Compile Include="DeviceTypeInterfaces\Template.cs" />
-    <Compile Include="DeviceTypeInterfaces\ITransport.cs" />
-    <Compile Include="Devices\GenericMonitoredTcpDevice.cs" />
-    <Compile Include="DeviceTypeInterfaces\INumeric.cs" />
-    <Compile Include="Devices\IVolumeAndAudioInterfaces.cs" />
-    <Compile Include="Display\BasicIrDisplay.cs" />
-    <Compile Include="Feedbacks\BoolFeedbackOneShot.cs" />
-    <Compile Include="Ramps and Increments\NumericalHelpers.cs" />
-    <Compile Include="Ramps and Increments\UshortSigIncrementer.cs" />
-    <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
-    <Compile Include="Routing\ICardPortsDevice.cs" />
-    <Compile Include="InUseTracking\IInUseTracking.cs" />
-    <Compile Include="InUseTracking\InUseTracking.cs" />
-    <Compile Include="Routing\IRoutingInputsExtensions.cs" />
-    <Compile Include="Monitoring\StatusMonitorCollection.cs" />
-    <Compile Include="Monitoring\CrestronGenericBaseCommunicationMonitor.cs" />
-    <Compile Include="Monitoring\StatusMonitorBase.cs" />
-    <Compile Include="Monitoring\Interfaces and things.cs" />
-    <Compile Include="Monitoring\GenericCommunicationMonitor.cs" />
-    <Compile Include="Devices\NewInterfaces.cs" />
-    <Compile Include="Devices\IAttachVideoStatusExtensions.cs" />
-    <Compile Include="Devices\IHasFeedbacks.cs" />
-    <Compile Include="Devices\SmartObjectBaseTypes.cs" />
-    <Compile Include="Devices\PresentationDeviceType.cs" />
-    <Compile Include="Display\DELETE IRDisplayBase.cs" />
-    <Compile Include="Display\MockDisplay.cs" />
-    <Compile Include="Ethernet\EthernetStatistics.cs" />
-    <Compile Include="Fusion\MOVED FusionSystemController.cs" />
-    <Compile Include="Global\Global.cs" />
-    <Compile Include="License\EssentialsLicenseManager.cs" />
-    <Compile Include="Feedbacks\BoolOutputLogicals.cs" />
-    <Compile Include="Presets\Interfaces.cs" />
-    <Compile Include="Presets\PresetsListSubpageReferenceListItem.cs" />
-    <Compile Include="Presets\DevicePresetsView.cs" />
-    <Compile Include="Presets\PresetChannel.cs" />
-    <Compile Include="Presets\DevicePresets.cs" />
-    <Compile Include="Routing\RoutingInterfaces.cs" />
-    <Compile Include="Routing\RoutingPort.cs" />
-    <Compile Include="Routing\RoutingPortCollection.cs" />
-    <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
-    <Compile Include="Routing\RoutingPortNames.cs" />
-    <Compile Include="Routing\TieLineConfig.cs" />
-    <Compile Include="Shades\Shade Interfaces.cs" />
-    <Compile Include="Shades\ShadeBase.cs" />
-    <Compile Include="Shades\ShadeController.cs" />
-    <Compile Include="SmartObjects\SmartObjectNumeric.cs" />
-    <Compile Include="SmartObjects\SmartObjectDynamicList.cs" />
-    <Compile Include="SmartObjects\SmartObjectDPad.cs" />
-    <Compile Include="SmartObjects\SmartObjectHelper.cs" />
-    <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
-    <Compile Include="Routing\TieLine.cs" />
-    <Compile Include="Timers\CountdownTimer.cs" />
-    <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
-    <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
-    <Compile Include="Touchpanels\MOVED LargeTouchpanelControllerBase.cs" />
-    <Compile Include="Touchpanels\TriListExtensions.cs" />
-    <Compile Include="Touchpanels\MOVED UIControllers\DevicePageControllerBase.cs" />
-    <Compile Include="UI PageManagers\BlurayPageManager.cs" />
-    <Compile Include="UI PageManagers\SetTopBoxThreePanelPageManager.cs" />
-    <Compile Include="UI PageManagers\SinglePageManager.cs" />
-    <Compile Include="UI PageManagers\PageManager.cs" />
-    <Compile Include="UI PageManagers\SetTopBoxTwoPanelPageManager.cs" />
-    <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
-    <Compile Include="VideoStatus\VideoStatusCues.cs" />
-    <Compile Include="Cues and DevAction\Cues.cs" />
-    <Compile Include="Comm and IR\ComPortController.cs" />
-    <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
-    <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />
-    <Compile Include="Devices\DeviceManager.cs" />
-    <Compile Include="Devices\IrOutputPortController.cs" />
-    <Compile Include="Display\DisplayBase.cs" />
-    <Compile Include="Feedbacks\FeedbackBase.cs" />
-    <Compile Include="Room\Room.cs" />
-    <Compile Include="Room\RoomCues.cs" />
-    <Compile Include="Room\MOVED RoomEventArgs.cs" />
-    <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
-    <Compile Include="Touchpanels\ModalDialog.cs" />
-    <Compile Include="Touchpanels\SmartGraphicsTouchpanelControllerBase.cs" />
-    <Compile Include="TriListBridges\HandlerBridge.cs" />
-    <Compile Include="Devices\FIND HOMES Interfaces.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SigHelper.cs" />
-    <Compile Include="REMOVE SigId.cs" />
-    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceList.cs" />
-    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceListItem.cs" />
-    <None Include="app.config" />
-    <None Include="Properties\ControlSystem.cfg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="bin\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
-  </PropertyGroup>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PepperDash.Essentials.Core</RootNamespace>
+    <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
+    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
+    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
+    <OSVersion>5.0</OSVersion>
+    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <NativePlatformName>Windows CE</NativePlatformName>
+    <FormFactorID>
+    </FormFactorID>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="PepperDash_Core, Version=1.0.1.26313, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
+    </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>
+      <Private>False</Private>
+    </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>
+      <Private>False</Private>
+    </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>
+    </Reference>
+    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <Private>False</Private>
+    </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>
+    </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>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Comm and IR\CecPortController.cs" />
+    <Compile Include="Comm and IR\GenericComm.cs" />
+    <Compile Include="Config\Essentials\ConfigUpdater.cs" />
+    <Compile Include="Config\Essentials\ConfigReader.cs" />
+    <Compile Include="Config\Essentials\ConfigWriter.cs" />
+    <Compile Include="Config\Essentials\EssentialsConfig.cs" />
+    <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
+    <Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
+    <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
+    <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
+    <Compile Include="Crestron IO\IOPortConfig.cs" />
+    <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
+    <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
+    <Compile Include="Devices\CodecInterfaces.cs" />
+    <Compile Include="Devices\CrestronProcessor.cs" />
+    <Compile Include="Devices\DeviceApiBase.cs" />
+    <Compile Include="Devices\ReconfigurableDevice.cs" />
+    <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="Factory\DeviceFactory.cs" />
+    <Compile Include="Feedbacks\BoolFeedback.cs" />
+    <Compile Include="Feedbacks\FeedbackCollection.cs" />
+    <Compile Include="Feedbacks\FeedbackEventArgs.cs" />
+    <Compile Include="Feedbacks\IntFeedback.cs" />
+    <Compile Include="Feedbacks\SerialFeedback.cs" />
+    <Compile Include="Feedbacks\StringFeedback.cs" />
+    <Compile Include="Global\JobTimer.cs" />
+    <Compile Include="Global\Scheduler.cs" />
+    <Compile Include="JoinMaps\JoinMapBase.cs" />
+    <Compile Include="Lighting\Lighting Interfaces.cs" />
+    <Compile Include="Lighting\LightingBase.cs" />
+    <Compile Include="Monitoring\SystemMonitorController.cs" />
+    <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
+    <Compile Include="Comm and IR\CommFactory.cs" />
+    <Compile Include="Comm and IR\CommunicationExtras.cs" />
+    <Compile Include="Comm and IR\ComSpecJsonConverter.cs" />
+    <Compile Include="Comm and IR\ConsoleCommMockDevice.cs" />
+    <Compile Include="Comm and IR\IRPortHelper.cs" />
+    <Compile Include="Config\BasicConfig.cs" />
+    <Compile Include="Config\ConfigPropertiesHelpers.cs" />
+    <Compile Include="Config\InfoConfig.cs" />
+    <Compile Include="Config\DeviceConfig.cs" />
+    <Compile Include="Constants\CommonCues.cs" />
+    <Compile Include="Devices\DisplayUiConstants.cs" />
+    <Compile Include="Devices\IUsageTracking.cs" />
+    <Compile Include="Devices\DeviceJsonApi.cs" />
+    <Compile Include="Devices\SourceListItem.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDisplayBasic.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDumbSource.cs" />
+    <Compile Include="DeviceTypeInterfaces\IWarmingCooling.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDiscPlayerControls.cs" />
+    <Compile Include="DeviceTypeInterfaces\IPower.cs" />
+    <Compile Include="DeviceTypeInterfaces\IUiDisplayInfo.cs" />
+    <Compile Include="DeviceTypeInterfaces\ISetTopBoxControls.cs" />
+    <Compile Include="DeviceTypeInterfaces\IChannel.cs" />
+    <Compile Include="DeviceTypeInterfaces\IColorFunctions.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDPad.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDvr.cs" />
+    <Compile Include="DeviceTypeInterfaces\Template.cs" />
+    <Compile Include="DeviceTypeInterfaces\ITransport.cs" />
+    <Compile Include="Devices\GenericMonitoredTcpDevice.cs" />
+    <Compile Include="DeviceTypeInterfaces\INumeric.cs" />
+    <Compile Include="Devices\IVolumeAndAudioInterfaces.cs" />
+    <Compile Include="Display\BasicIrDisplay.cs" />
+    <Compile Include="Feedbacks\BoolFeedbackOneShot.cs" />
+    <Compile Include="Ramps and Increments\NumericalHelpers.cs" />
+    <Compile Include="Ramps and Increments\UshortSigIncrementer.cs" />
+    <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
+    <Compile Include="Routing\ICardPortsDevice.cs" />
+    <Compile Include="InUseTracking\IInUseTracking.cs" />
+    <Compile Include="InUseTracking\InUseTracking.cs" />
+    <Compile Include="Routing\IRoutingInputsExtensions.cs" />
+    <Compile Include="Monitoring\StatusMonitorCollection.cs" />
+    <Compile Include="Monitoring\CrestronGenericBaseCommunicationMonitor.cs" />
+    <Compile Include="Monitoring\StatusMonitorBase.cs" />
+    <Compile Include="Monitoring\Interfaces and things.cs" />
+    <Compile Include="Monitoring\GenericCommunicationMonitor.cs" />
+    <Compile Include="Devices\NewInterfaces.cs" />
+    <Compile Include="Devices\IAttachVideoStatusExtensions.cs" />
+    <Compile Include="Devices\IHasFeedbacks.cs" />
+    <Compile Include="Devices\SmartObjectBaseTypes.cs" />
+    <Compile Include="Devices\PresentationDeviceType.cs" />
+    <Compile Include="Display\DELETE IRDisplayBase.cs" />
+    <Compile Include="Display\MockDisplay.cs" />
+    <Compile Include="Ethernet\EthernetStatistics.cs" />
+    <Compile Include="Fusion\MOVED FusionSystemController.cs" />
+    <Compile Include="Global\Global.cs" />
+    <Compile Include="License\EssentialsLicenseManager.cs" />
+    <Compile Include="Feedbacks\BoolOutputLogicals.cs" />
+    <Compile Include="Presets\Interfaces.cs" />
+    <Compile Include="Presets\PresetsListSubpageReferenceListItem.cs" />
+    <Compile Include="Presets\DevicePresetsView.cs" />
+    <Compile Include="Presets\PresetChannel.cs" />
+    <Compile Include="Presets\DevicePresets.cs" />
+    <Compile Include="Routing\RoutingInterfaces.cs" />
+    <Compile Include="Routing\RoutingPort.cs" />
+    <Compile Include="Routing\RoutingPortCollection.cs" />
+    <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
+    <Compile Include="Routing\RoutingPortNames.cs" />
+    <Compile Include="Routing\TieLineConfig.cs" />
+    <Compile Include="Shades\Shade Interfaces.cs" />
+    <Compile Include="Shades\ShadeBase.cs" />
+    <Compile Include="Shades\ShadeController.cs" />
+    <Compile Include="SmartObjects\SmartObjectNumeric.cs" />
+    <Compile Include="SmartObjects\SmartObjectDynamicList.cs" />
+    <Compile Include="SmartObjects\SmartObjectDPad.cs" />
+    <Compile Include="SmartObjects\SmartObjectHelper.cs" />
+    <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
+    <Compile Include="Routing\TieLine.cs" />
+    <Compile Include="Timers\CountdownTimer.cs" />
+    <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
+    <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
+    <Compile Include="Touchpanels\MOVED LargeTouchpanelControllerBase.cs" />
+    <Compile Include="Touchpanels\TriListExtensions.cs" />
+    <Compile Include="Touchpanels\MOVED UIControllers\DevicePageControllerBase.cs" />
+    <Compile Include="UI PageManagers\BlurayPageManager.cs" />
+    <Compile Include="UI PageManagers\SetTopBoxThreePanelPageManager.cs" />
+    <Compile Include="UI PageManagers\SinglePageManager.cs" />
+    <Compile Include="UI PageManagers\PageManager.cs" />
+    <Compile Include="UI PageManagers\SetTopBoxTwoPanelPageManager.cs" />
+    <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
+    <Compile Include="VideoStatus\VideoStatusCues.cs" />
+    <Compile Include="Cues and DevAction\Cues.cs" />
+    <Compile Include="Comm and IR\ComPortController.cs" />
+    <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
+    <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />
+    <Compile Include="Devices\DeviceManager.cs" />
+    <Compile Include="Devices\IrOutputPortController.cs" />
+    <Compile Include="Display\DisplayBase.cs" />
+    <Compile Include="Feedbacks\FeedbackBase.cs" />
+    <Compile Include="Room\Room.cs" />
+    <Compile Include="Room\RoomCues.cs" />
+    <Compile Include="Room\MOVED RoomEventArgs.cs" />
+    <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
+    <Compile Include="Touchpanels\ModalDialog.cs" />
+    <Compile Include="Touchpanels\SmartGraphicsTouchpanelControllerBase.cs" />
+    <Compile Include="TriListBridges\HandlerBridge.cs" />
+    <Compile Include="Devices\FIND HOMES Interfaces.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SigHelper.cs" />
+    <Compile Include="REMOVE SigId.cs" />
+    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceList.cs" />
+    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceListItem.cs" />
+    <None Include="app.config" />
+    <None Include="Properties\ControlSystem.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="bin\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+  <PropertyGroup>
+    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
+  </PropertyGroup>
 </Project>

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -287,7 +287,9 @@ namespace PepperDash.Essentials.DM
         {
             Debug.Console(2, this, "Adding input card '{0}', slot {1}", type, number);
 
-            if (type == "dmcHd")
+            type = type.ToLower();
+
+            if (type == "dmchd")
             {
                 var inputCard = new DmcHd(number, this.Chassis);
                 var cecPort = inputCard.HdmiInput as ICec;
@@ -299,7 +301,7 @@ namespace PepperDash.Essentials.DM
                 var cecPort = inputCard.HdmiInput as ICec;
                 AddHdmiInCardPorts(number, cecPort);
             }
-            else if (type == "dmc4kHd")
+            else if (type == "dmc4khd")
             {
                 var inputCard = new Dmc4kHd(number, this.Chassis);
                 var cecPort = inputCard.HdmiInput as ICec;
@@ -311,125 +313,125 @@ namespace PepperDash.Essentials.DM
                 var cecPort = inputCard.HdmiInput as ICec;
                 AddHdmiInCardPorts(number, cecPort);
             }
-            else if (type == "dmc4kzHd")
+            else if (type == "dmc4kzhd")
             {
                 var inputCard = new Dmc4kzHd(number, this.Chassis);
                 var cecPort = inputCard.HdmiInput as ICec;
                 AddHdmiInCardPorts(number, cecPort);
             }
-            else if (type == "dmc4kzHdDsp")
+            else if (type == "dmc4kzhddsp")
             {
                 var inputCard = new Dmc4kzHdDsp(number, this.Chassis);
                 var cecPort = inputCard.HdmiInput as ICec;
                 AddHdmiInCardPorts(number, cecPort);
             }
-            else if (type == "dmcC")
+            else if (type == "dmcc")
             {
                 new DmcC(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmcCDsp")
+            else if (type == "dmccdsp")
             {
                 new DmcCDsp(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmc4kC")
+            else if (type == "dmc4kc")
             {
                 new Dmc4kC(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmc4kCDsp")
+            else if (type == "dmc4kcdsp")
             {
                 new Dmc4kCDsp(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmc4kzC")
+            else if (type == "dmc4kzc")
             {
                 new Dmc4kzC(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmc4kzCDsp")
+            else if (type == "dmc4kzcdsp")
             {
                 new Dmc4kzCDsp(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmcCat")
+            else if (type == "dmccat")
             {
                 new DmcCat(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmcCatDsp")
+            else if (type == "dmccatdsp")
             {
                 new DmcCatDsp(number, this.Chassis);
                 AddDmInCardPorts(number);
             }
-            else if (type == "dmcS")
+            else if (type == "dmcs")
             {
                 new DmcS(number, Chassis);
                 AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
                 AddInCardHdmiAndAudioLoopPorts(number);
             }
-            else if (type == "dmcSDsp")
+            else if (type == "dmcsdsp")
             {
                 new DmcSDsp(number, Chassis);
                 AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
                 AddInCardHdmiAndAudioLoopPorts(number);
             }
-            else if (type == "dmcS2")
+            else if (type == "dmcs2")
             {
                 new DmcS2(number, Chassis);
                 AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
                 AddInCardHdmiAndAudioLoopPorts(number);
             }
-            else if (type == "dmcS2Dsp")
+            else if (type == "dmcs2dsp")
             {
                 new DmcS2Dsp(number, Chassis);
                 AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
                 AddInCardHdmiAndAudioLoopPorts(number);
             }
-            else if (type == "dmcSdi")
+            else if (type == "dmcsdi")
             {
                 new DmcSdi(number, Chassis);
                 AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi);
                 AddOutputPortWithDebug(string.Format("inputCard{0}", number), "sdiOut", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi, null);
                 AddInCardHdmiAndAudioLoopPorts(number);
             }
-            else if (type == "dmcDvi")
+            else if (type == "dmcdvi")
             {
                 new DmcDvi(number, Chassis);
                 AddInputPortWithDebug(number, "dviIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Dvi);
                 AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                 AddInCardHdmiLoopPort(number);
             }
-            else if (type == "dmcVga")
+            else if (type == "dmcvga")
             {
                 new DmcVga(number, Chassis);
                 AddInputPortWithDebug(number, "vgaIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Vga);
                 AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                 AddInCardHdmiLoopPort(number);
             }
-            else if (type == "dmcVidBnc")
+            else if (type == "dmcvidbnc")
             {
                 new DmcVidBnc(number, Chassis);
                 AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
                 AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                 AddInCardHdmiLoopPort(number);
             }
-            else if (type == "dmcVidRcaA")
+            else if (type == "dmcvidrcaa")
             {
                 new DmcVidRcaA(number, Chassis);
                 AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
                 AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                 AddInCardHdmiLoopPort(number);
             }
-            else if (type == "dmcVidRcaD")
+            else if (type == "dmcvidrcad")
             {
                 new DmcVidRcaD(number, Chassis);
                 AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
                 AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.DigitalAudio);
                 AddInCardHdmiLoopPort(number);
             }
-            else if (type == "dmcVid4")
+            else if (type == "dmcvid4")
             {
                 new DmcVid4(number, Chassis);
                 AddInputPortWithDebug(number, "compositeIn1", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
@@ -438,7 +440,7 @@ namespace PepperDash.Essentials.DM
                 AddInputPortWithDebug(number, "compositeIn4", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                 AddInCardHdmiLoopPort(number);
             }
-            else if (type == "dmcStr")
+            else if (type == "dmcstr")
             {
                 new DmcStr(number, Chassis);
                 AddInputPortWithDebug(number, "streamIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
@@ -476,46 +478,48 @@ namespace PepperDash.Essentials.DM
         /// <param name="number"></param>
         public void AddOutputCard(string type, uint number)
         {
+            type = type.ToLower();
+
             Debug.Console(2, this, "Adding output card '{0}', slot {1}", type, number);
-            if (type == "dmc4kHdo")
+            if (type == "dmc4khdo")
             {
                 var outputCard = new Dmc4kHdoSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;
                 var cecPort2 = outputCard.Card2.HdmiOutput;
                 AddDmcHdoPorts(number, cecPort1, cecPort2);
             }
-            else if (type == "dmcHdo")
+            else if (type == "dmchdo")
             {
                 var outputCard = new DmcHdoSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;
                 var cecPort2 = outputCard.Card2.HdmiOutput;
                 AddDmcHdoPorts(number, cecPort1, cecPort2);
             }
-            else if (type == "dmc4kCoHd")
+            else if (type == "dmc4kcohd")
             {
                 var outputCard = new Dmc4kCoHdSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;
                 AddDmcCoPorts(number, cecPort1);
             }
-			else if (type == "dmc4kzCoHd")
+			else if (type == "dmc4kzcohd")
 			{
                 var outputCard = new Dmc4kzCoHdSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;
                 AddDmcCoPorts(number, cecPort1);
             }
-			else if (type == "dmcCoHd")
+			else if (type == "dmccohd")
             {
                 var outputCard = new DmcCoHdSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;
                 AddDmcCoPorts(number, cecPort1);
             }
-            else if (type == "dmCatoHd")
+            else if (type == "dmccatohd")
             {
                 var outputCard = new DmcCatoHdSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;
                 AddDmcCoPorts(number, cecPort1);
             }
-            else if (type == "dmcSoHd")
+            else if (type == "dmcsohd")
             {
                 var outputCard = new DmcSoHdSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;
@@ -524,7 +528,7 @@ namespace PepperDash.Essentials.DM
                 AddOutputPortWithDebug(string.Format("outputCard{0}", number), "dmOut2", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, 2 * (number - 1) + 2);
 
             }
-            else if (type == "dmcS2oHd")
+            else if (type == "dmcs2ohd")
             {
                 var outputCard = new DmcS2oHdSingle(number, Chassis);
                 var cecPort1 = outputCard.Card1.HdmiOutput;

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs

@@ -0,0 +1,285 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Cards;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+using PepperDash.Essentials.DM.Config;
+
+namespace PepperDash.Essentials.DM
+{
+    /// <summary>
+    /// Exposes the volume levels for Program, Aux1 or Aux2 outputs on a DMPS3 chassis
+    /// </summary>
+    public class DmpsAudioOutputController : Device
+    {
+        Card.Dmps3OutputBase OutputCard;
+
+        public DmpsAudioOutput MasterVolumeLevel { get; private set; }
+        public DmpsAudioOutput SourceVolumeLevel { get; private set; }
+        public DmpsAudioOutput Codec1VolumeLevel { get; private set; }
+        public DmpsAudioOutput Codec2VolumeLevel { get; private set; }
+
+
+        public DmpsAudioOutputController(string key, string name, Card.Dmps3OutputBase card)
+            : base(key, name)
+        {
+            OutputCard = card;
+
+            OutputCard.BaseDevice.DMOutputChange += new DMOutputEventHandler(BaseDevice_DMOutputChange);
+
+            MasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Master);
+            SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+
+            if (card is Card.Dmps3ProgramOutput)
+            {
+                //(card as Card.Dmps3ProgramOutput).OutputMixer.MicLevel
+                    //TODO:  Hook up mic levels and mutes
+                Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
+                Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
+            }
+            else if (card is Card.Dmps3Aux1Output)
+            {
+                Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
+            }
+            else if (card is Card.Dmps3Aux2Output)
+            {
+                Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
+            }
+        }
+
+        void BaseDevice_DMOutputChange(Switch device, DMOutputEventArgs args)
+        {
+            switch (args.EventId)
+            {
+                case DMOutputEventIds.MasterVolumeFeedBackEventId:
+                {
+                    MasterVolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    break;
+                }
+                case DMOutputEventIds.MasterMuteOnFeedBackEventId:
+                {
+                    MasterVolumeLevel.MuteFeedback.FireUpdate();
+                    break;
+                }
+                case DMOutputEventIds.SourceLevelFeedBackEventId:
+                {
+                    SourceVolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    break;
+                }
+                case DMOutputEventIds.Codec1LevelFeedBackEventId:
+                {
+                    if(Codec1VolumeLevel != null)
+                        Codec1VolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    break;
+                }
+                case DMOutputEventIds.Codec1MuteOnFeedBackEventId:
+                {
+                    if (Codec1VolumeLevel != null)
+                        Codec1VolumeLevel.MuteFeedback.FireUpdate();
+                    break;
+                }
+                case DMOutputEventIds.Codec2LevelFeedBackEventId:
+                {
+                    if (Codec2VolumeLevel != null)
+                        Codec2VolumeLevel.VolumeLevelFeedback.FireUpdate();
+                    break;
+                }
+                case DMOutputEventIds.Codec2MuteOnFeedBackEventId:
+                {
+                    if (Codec2VolumeLevel != null)
+                        Codec2VolumeLevel.MuteFeedback.FireUpdate();
+                    break;
+                }
+            }
+        }
+    }
+
+    public class DmpsAudioOutput : IBasicVolumeWithFeedback
+    {
+        Card.Dmps3OutputBase Output;
+
+        UShortInputSig Level;
+
+        eDmpsLevelType Type;
+
+        public BoolFeedback MuteFeedback { get; private set; }
+        public IntFeedback VolumeLevelFeedback { get; private set; }
+
+        Action MuteOnAction;
+        Action MuteOffAction;
+        Action<bool> VolumeUpAction;
+        Action<bool> VolumeDownAction;
+ 
+        public DmpsAudioOutput(Card.Dmps3OutputBase output, eDmpsLevelType type)
+        {
+            Output = output;
+
+            Type = type;
+
+            switch (type)
+            {
+                case eDmpsLevelType.Master:
+                    {
+                        Level = output.MasterVolume;
+
+                        MuteFeedback = new BoolFeedback( new Func<bool> (() => Output.MasterMuteOnFeedBack.BoolValue));
+                        VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Output.MasterVolumeFeedBack.UShortValue));
+                        MuteOnAction = new Action(Output.MasterMuteOn);
+                        MuteOffAction = new Action(Output.MasterMuteOff);
+                        VolumeUpAction = new Action<bool>((b) => Output.MasterVolumeUp.BoolValue = b);
+                        VolumeDownAction = new Action<bool>((b) => Output.MasterVolumeDown.BoolValue = b);
+
+                        
+                        break;
+                    }
+                case eDmpsLevelType.MicsMaster:
+                    {
+                        Level = output.MicMasterLevel;
+
+                        MuteFeedback = new BoolFeedback(new Func<bool>(() => Output.MicMasterMuteOnFeedBack.BoolValue));
+                        VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Output.MicMasterLevelFeedBack.UShortValue));
+                        MuteOnAction = new Action(Output.MicMasterMuteOn);
+                        MuteOffAction = new Action(Output.MicMasterMuteOff);
+                        VolumeUpAction = new Action<bool>((b) => Output.MicMasterLevelUp.BoolValue = b);
+                        VolumeDownAction = new Action<bool>((b) => Output.MicMasterLevelDown.BoolValue = b);
+
+                        break;
+                    }
+                case eDmpsLevelType.Source:
+                    {
+                        Level = output.SourceLevel;
+
+                        MuteFeedback = new BoolFeedback(new Func<bool>(() => Output.SourceMuteOnFeedBack.BoolValue));
+                        VolumeLevelFeedback = new IntFeedback(new Func<int>(() => Output.SourceLevelFeedBack.UShortValue));
+                        MuteOnAction = new Action(Output.SourceMuteOn);
+                        MuteOffAction = new Action(Output.SourceMuteOff);
+                        VolumeUpAction = new Action<bool>((b) => Output.SourceLevelUp.BoolValue = b);
+                        VolumeDownAction = new Action<bool>((b) => Output.SourceLevelDown.BoolValue = b);
+                        break;
+                    }
+                case eDmpsLevelType.Codec1:
+                    {
+                        var programOutput = output as Card.Dmps3ProgramOutput;
+
+                        if (programOutput != null)
+                        {
+                            Level = programOutput.Codec1Level;
+
+                            MuteFeedback = new BoolFeedback(new Func<bool>(() => programOutput.CodecMute1OnFeedback.BoolValue));
+                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => programOutput.Codec1LevelFeedback.UShortValue));
+                            MuteOnAction = new Action(programOutput.Codec1MuteOn);
+                            MuteOffAction = new Action(programOutput.Codec1MuteOff);
+                            VolumeUpAction = new Action<bool>((b) => programOutput.Codec1LevelUp.BoolValue = b);
+                            VolumeDownAction = new Action<bool>((b) => programOutput.Codec1LevelDown.BoolValue = b);
+
+                        }
+                        else
+                        {
+                            var auxOutput = output as Card.Dmps3Aux2Output;
+
+                            Level = auxOutput.Codec1Level;
+
+                            MuteFeedback = new BoolFeedback(new Func<bool>(() => auxOutput.CodecMute1OnFeedback.BoolValue));
+                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => auxOutput.Codec1LevelFeedback.UShortValue));
+                            MuteOnAction = new Action(auxOutput.Codec1MuteOn);
+                            MuteOffAction = new Action(auxOutput.Codec1MuteOff);
+                            VolumeUpAction = new Action<bool>((b) => auxOutput.Codec1LevelUp.BoolValue = b);
+                            VolumeDownAction = new Action<bool>((b) => auxOutput.Codec1LevelDown.BoolValue = b);
+                        }
+                        break;
+                    }
+                case eDmpsLevelType.Codec2:
+                    {
+                        var programOutput = output as Card.Dmps3ProgramOutput;
+
+                        if (programOutput != null)
+                        {
+                            Level = programOutput.Codec2Level;
+
+                            MuteFeedback = new BoolFeedback(new Func<bool>(() => programOutput.CodecMute1OnFeedback.BoolValue));
+                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => programOutput.Codec2LevelFeedback.UShortValue));
+                            MuteOnAction = new Action(programOutput.Codec2MuteOn);
+                            MuteOffAction = new Action(programOutput.Codec2MuteOff);
+                            VolumeUpAction = new Action<bool>((b) => programOutput.Codec2LevelUp.BoolValue = b);
+                            VolumeDownAction = new Action<bool>((b) => programOutput.Codec2LevelDown.BoolValue = b);
+
+                        }
+                        else
+                        {
+                            var auxOutput = output as Card.Dmps3Aux1Output;
+
+                            Level = auxOutput.Codec2Level;
+
+                            MuteFeedback = new BoolFeedback(new Func<bool>(() => auxOutput.CodecMute2OnFeedback.BoolValue));
+                            VolumeLevelFeedback = new IntFeedback(new Func<int>(() => auxOutput.Codec2LevelFeedback.UShortValue));
+                            MuteOnAction = new Action(auxOutput.Codec2MuteOn);
+                            MuteOffAction = new Action(auxOutput.Codec2MuteOff);
+                            VolumeUpAction = new Action<bool>((b) => auxOutput.Codec2LevelUp.BoolValue = b);
+                            VolumeDownAction = new Action<bool>((b) => auxOutput.Codec2LevelDown.BoolValue = b);
+                        }
+                        break;
+                    }
+            }
+
+        }
+
+        #region IBasicVolumeWithFeedback Members
+
+        public void SetVolume(ushort level)
+        {
+            Level.UShortValue = level;
+        }
+
+        public void MuteOn()
+        {
+            MuteOnAction();
+        }
+
+        public void MuteOff()
+        {
+            MuteOffAction();
+        }
+
+        #endregion
+
+        #region IBasicVolumeControls Members
+
+        public void VolumeUp(bool pressRelease)
+        {
+            VolumeUpAction(pressRelease);
+        }
+
+        public void VolumeDown(bool pressRelease)
+        {
+            VolumeDownAction(pressRelease);
+        }
+
+        public void MuteToggle()
+        {
+            if (MuteFeedback.BoolValue)
+                MuteOff();
+            else
+                MuteOn();
+        }
+
+        #endregion
+    }
+
+    public enum eDmpsLevelType
+    {
+        Master,
+        Source,
+        MicsMaster,
+        Codec1,
+        Codec2,
+        Mic
+    }
+}

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs

@@ -309,6 +309,8 @@ namespace PepperDash.Essentials.DM
             {
                 var airMediaInputCard = inputCard as Card.Dmps3AirMediaInput;
 
+                
+
                 AddInputPortWithDebug(number, string.Format("AirMediaIn{0}", number), eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
             }
         }
@@ -370,14 +372,31 @@ namespace PepperDash.Essentials.DM
             else if (outputCard is Card.Dmps3ProgramOutput)
             {
                 AddAudioOnlyOutputPort(number, "Program");
+
+                var programOutput = new DmpsAudioOutputController(string.Format("processor-programAudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
+
+                DeviceManager.AddDevice(programOutput);
+
                 return;
             }
             else if (outputCard is Card.Dmps3AuxOutput)
             {
-                if(outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux1Output)
+                if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux1Output)
+                {
                     AddAudioOnlyOutputPort(number, "Aux1");
-                else if(outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux2Output)
+
+                    var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
+
+                    DeviceManager.AddDevice(aux1Output);
+                }
+                else if (outputCard.CardInputOutputType == eCardInputOutputType.Dmps3Aux2Output)
+                {
                     AddAudioOnlyOutputPort(number, "Aux2");
+
+                    var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3OutputBase);
+
+                    DeviceManager.AddDevice(aux2Output);
+                }
                 return;
             }
             else if (outputCard is Card.Dmps3CodecOutput)

essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.AirMedia;
 using Crestron.SimplSharpPro.UI;
 
@@ -68,7 +69,24 @@ namespace PepperDash.Essentials.DM
 				return PepperDash.Essentials.DM.Chassis.HdMdNxM4kEController.GetController(key, name, type, props);
 			}
 
-            
+            else if (typeName.Equals("hdmd400ce") || typeName.Equals("hdmd300ce") || typeName.Equals("hdmd200ce") || typeName.Equals("hdmd200c1ge"))
+            {
+                var props = JsonConvert.DeserializeObject
+                    <PepperDash.Essentials.DM.HdMdxxxCEPropertiesConfig>(properties.ToString());
+
+                if (typeName.Equals("hdmd400ce"))
+                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
+                        new HdMd400CE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
+                else if (typeName.Equals("hdmd300ce"))
+                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
+                        new HdMd300CE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
+                else if (typeName.Equals("hdmd200ce"))
+                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
+                        new HdMd200CE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
+                else if (typeName.Equals("hdmd200c1ge"))
+                    return new PepperDash.Essentials.DM.HdMdxxxCEController(key, name,
+                        new HdMd200C1GE(props.Control.IpIdInt, props.Control.TcpSshProperties.Address, Global.ControlSystem));
+            } 
 
 			return null;
 		}

essentials-framework/Essentials DM/Essentials_DM/DmLite/HdMdxxxCEController.cs

@@ -0,0 +1,226 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Receivers;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.DM
+{
+    /// <summary>
+    /// Represent both a transmitter and receiver pair of the HD-MD-400-C-E / HD-MD-300-C-E / HD-MD-200-C-E kits
+    /// </summary>
+    public class HdMdxxxCEController : CrestronGenericBaseDevice, IRouting//, IComPorts
+    {
+        /// <summary>
+        /////  DmLite Ports
+        ///// </summary>
+        //public RoutingOutputPort ToRx { get; private set; }
+        //public RoutingInputPort FromTx { get; private set; }
+
+        public RoutingOutputPort HdmiOut { get; private set; }
+
+        public HdMdxxxCE TxRxPair { get; private set; }
+
+        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
+        /// <summary>
+        /// The value of the current video source for the HDMI output on the receiver
+        /// </summary>
+        public IntFeedback VideoSourceFeedback { get; private set; }
+
+        /// <summary>
+        /// Indicates if Auto Route is on on the transmitter
+        /// </summary>
+        public BoolFeedback AutoRouteOnFeedback { get; private set; }
+
+        /// <summary>
+        /// Indicates if Priority Routing is on on the transmitter
+        /// </summary>
+        public BoolFeedback PriorityRoutingOnFeedback { get; private set; }
+
+        /// <summary>
+        /// INdicates if the On Screen Display is enabled 
+        /// </summary>
+        public BoolFeedback InputOnScreenDisplayEnabledFeedback { get; private set; }
+
+        /// <summary>
+        /// Indicates if video sync is detected on each of the inputs
+        /// </summary>
+        public Dictionary<uint, BoolFeedback> SyncDetectedFeedbacks { get; private set; }
+
+        /// <summary>
+        /// Indicates if the remote end device is detected
+        /// </summary>
+        public BoolFeedback RemoteEndDetectedFeedback { get; private set; }
+
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts
+        {
+            get { return new RoutingPortCollection<RoutingOutputPort> { HdmiOut }; }
+        }
+
+        public HdMdxxxCEController(string key, string name, HdMdxxxCE txRxPair)
+            :base(key, name, txRxPair)
+        {
+
+            TxRxPair = txRxPair;
+
+            RemoteEndDetectedFeedback = new BoolFeedback(() => TxRxPair.RemoteEndDetectedOnFeedback.BoolValue);
+
+            AutoRouteOnFeedback = new BoolFeedback(() => TxRxPair.ReceiverAutoModeOnFeedback.BoolValue);
+
+            PriorityRoutingOnFeedback = new BoolFeedback(() => TxRxPair.PriorityRoutingOnFeedback.BoolValue);
+
+            InputOnScreenDisplayEnabledFeedback = new BoolFeedback(() => TxRxPair.OnScreenDisplayEnabledFeedback.BoolValue);
+
+            InputPorts = new RoutingPortCollection<RoutingInputPort>();
+
+            SyncDetectedFeedbacks = new Dictionary<uint, BoolFeedback>();
+
+            // Add the HDMI input port on the receiver
+            InputPorts.Add(new RoutingInputPort(DmPortName.Hdmi, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, 1, this));
+
+            SyncDetectedFeedbacks.Add(1, new BoolFeedback( () => TxRxPair.HdmiInputs[1].VideoDetectedFeedback.BoolValue));
+
+            if(txRxPair is HdMd400CE)
+            {
+                InputPorts.Add(new RoutingInputPort(DmPortName.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, 2, this));
+                SyncDetectedFeedbacks.Add(2, new BoolFeedback(() => TxRxPair.HdmiInputs[2].VideoDetectedFeedback.BoolValue));
+
+                InputPorts.Add(new RoutingInputPort(DmPortName.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, 3, this));
+                SyncDetectedFeedbacks.Add(3, new BoolFeedback(() => TxRxPair.HdmiInputs[3].VideoDetectedFeedback.BoolValue));
+
+                InputPorts.Add(new RoutingInputPort(DmPortName.VgaIn, eRoutingSignalType.Video | eRoutingSignalType.Audio,
+                    eRoutingPortConnectionType.Vga, 4, this));
+                SyncDetectedFeedbacks.Add(4, new BoolFeedback(() => TxRxPair.VgaInputs[1].VideoDetectedFeedback.BoolValue));
+
+                // Set Ports for CEC
+                InputPorts[DmPortName.HdmiIn1].Port = TxRxPair.HdmiInputs[1];
+                InputPorts[DmPortName.HdmiIn2].Port = TxRxPair.HdmiInputs[2];
+            }
+            else if (txRxPair is HdMd300CE)
+            {
+                InputPorts.Add(new RoutingInputPort(DmPortName.HdmiIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                    eRoutingPortConnectionType.Hdmi, 2, this));
+                SyncDetectedFeedbacks.Add(2, new BoolFeedback(() => TxRxPair.HdmiInputs[2].VideoDetectedFeedback.BoolValue));
+
+                InputPorts.Add(new RoutingInputPort(DmPortName.VgaIn, eRoutingSignalType.Video | eRoutingSignalType.Audio,
+                    eRoutingPortConnectionType.Vga, 3, this));
+                SyncDetectedFeedbacks.Add(3, new BoolFeedback(() => TxRxPair.VgaInputs[1].VideoDetectedFeedback.BoolValue));
+
+                // Set Ports for CEC
+                InputPorts[DmPortName.HdmiIn].Port = TxRxPair.HdmiInputs[1];
+            }
+            else if (txRxPair is HdMd200CE || txRxPair is HdMd200C1GE)
+            {
+                InputPorts.Add(new RoutingInputPort(DmPortName.HdmiIn, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                    eRoutingPortConnectionType.Hdmi, 2, this));
+                SyncDetectedFeedbacks.Add(2, new BoolFeedback(() => TxRxPair.HdmiInputs[2].VideoDetectedFeedback.BoolValue));
+
+                // Set Ports for CEC
+                InputPorts[DmPortName.HdmiIn].Port = TxRxPair.HdmiInputs[1];
+            }
+
+            //ToRx = new RoutingOutputPort(DmPortName.ToTx, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+            //    eRoutingPortConnectionType.DmCat, null, this);
+
+            //FromTx = new RoutingInputPort(DmPortName.FromTx, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+            //    eRoutingPortConnectionType.DmCat, null, this);
+
+            HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, null, this);
+
+            OutputPorts[DmPortName.HdmiOut].Port = TxRxPair.HdmiOutputs[1];
+
+            TxRxPair.DMInputChange += new DMInputEventHandler(TxRxPair_DMInputChange);
+            TxRxPair.DMOutputChange += new DMOutputEventHandler(TxRxPair_DMOutputChange);
+            TxRxPair.DMSystemChange += new DMSystemEventHandler(TxRxPair_DMSystemChange);
+
+            VideoSourceFeedback = new IntFeedback(() => (int)TxRxPair.HdmiOutputs[1].VideoOutFeedback.Number);
+        }
+
+        void TxRxPair_DMSystemChange(Switch device, DMSystemEventArgs args)
+        {
+            if (args.EventId == DMSystemEventIds.RemoteEndDetectedEventId)
+                RemoteEndDetectedFeedback.FireUpdate();
+            else if (args.EventId == DMSystemEventIds.ReceiverAutoModeOnEventId)
+                AutoRouteOnFeedback.FireUpdate();
+            else if (args.EventId == DMSystemEventIds.PriorityRoutingOnEventId)
+                PriorityRoutingOnFeedback.FireUpdate();
+            else if (args.EventId == DMSystemEventIds.OnScreenDisplayEnabledEventId)
+                InputOnScreenDisplayEnabledFeedback.FireUpdate();
+        }
+
+        void TxRxPair_DMOutputChange(Switch device, DMOutputEventArgs args)
+        {
+            if (args.EventId == DMOutputEventIds.VideoOutEventId)
+                VideoSourceFeedback.FireUpdate();
+        }
+
+        void TxRxPair_DMInputChange(Switch device, DMInputEventArgs args)
+        {
+            if (args.EventId == DMInputEventIds.VideoDetectedEventId)
+                SyncDetectedFeedbacks[args.Number].FireUpdate();
+        }
+
+        public void AutoRouteOn()
+        {
+            TxRxPair.TransmitterAutoModeOn();
+        }
+
+        public void AutoRouteOff()
+        {
+            TxRxPair.TransmitterAutoModeOff();
+        }
+
+        public void PriorityRouteOn()
+        {
+            TxRxPair.PriorityRoutingOn();
+        }
+
+        public void PriorityRouteOff()
+        {
+            TxRxPair.PriorityRoutingOff();
+        }
+
+        public void OnScreenDisplayEnable()
+        {
+            TxRxPair.OnScreenDisplayEnabled();
+        }
+
+        public void OnScreenDisplayDisable()
+        {
+            TxRxPair.OnScreenDisplayDisabled();
+        }
+
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+        {
+            var number = Convert.ToUInt32(inputSelector); // Cast can sometimes fail
+
+            var input = number == 0 ? null : TxRxPair.Inputs[number];
+
+            TxRxPair.HdmiOutputs[1].VideoOut = input;
+        }
+
+        // This device has a different class for com ports which will make it hard to implement IComPorts....
+
+        //#region IComPorts Members
+        //public CrestronCollection<ComPort> ComPorts { get { return TxRxPair.ComPorts as CrestronCollection<ComPort>; } }
+        //public int NumberOfComPorts { get { return 1; } }
+        //#endregion
+    }
+
+    public class HdMdxxxCEPropertiesConfig
+    {
+        public ControlPropertiesConfig Control { get; set; }
+    }
+}

essentials-framework/Essentials DM/Essentials_DM/DmPortName.cs

@@ -26,6 +26,8 @@ namespace PepperDash.Essentials.DM
 		public const string DmOut = "DmOut";
 		public const string DmOut1 = "DmOut1";
 		public const string DmOut2 = "DmOut2";
+        public const string FromTx = "FromTx";
+        public const string Hdmi = "Hdmi";
 		public const string HdmiIn = "HdmiIn";
 		public const string HdmiIn1 = "HdmiIn1";
 		public const string HdmiIn2 = "HdmiIn2";
@@ -35,6 +37,7 @@ namespace PepperDash.Essentials.DM
 		public const string HdmiOut = "HdmiOut";
         public const string Osd = "Osd";
         public const string SpdifIn = "SpdifIn";
+        public const string ToTx = "ToTx";
 		public const string VgaIn = "VgaIn";
 	}
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -112,6 +112,8 @@ namespace PepperDash.Essentials.DM
 				{
                     if (typeName.StartsWith("dmrmc100c"))
 						return new DmRmcX100CController(key, name, new DmRmc100C(ipid, Global.ControlSystem));
+                    if (typeName.StartsWith("dmrmc100s"))
+                        return new DmRmc100SController(key, name, new DmRmc100S(ipid, Global.ControlSystem));
                     if (typeName.StartsWith("dmrmc4k100c"))
                         return new DmRmcX100CController(key, name, new DmRmc4k100C(ipid, Global.ControlSystem));
                     if (typeName.StartsWith("dmrmc4kz100c"))
@@ -182,6 +184,8 @@ namespace PepperDash.Essentials.DM
 							return new DmRmc4k100C1GController(key, name, new DmRmc4K100C1G(chassis.Outputs[num]));
 						if (typeName.StartsWith("dmrmc100c"))
 							return new DmRmcX100CController(key, name, new DmRmc100C(chassis.Outputs[num]));
+                        if (typeName.StartsWith("dmrmc100s"))
+                            return new DmRmc100SController(key, name, new DmRmc100S(chassis.Outputs[num]));
 						if (typeName.StartsWith("dmrmc4k100c"))
 							return new DmRmcX100CController(key, name, new DmRmc4k100C(chassis.Outputs[num]));
 						if (typeName.StartsWith("dmrmc4kz100c"))
@@ -213,6 +217,8 @@ namespace PepperDash.Essentials.DM
 							return new DmRmc4k100C1GController(key, name, new DmRmc4K100C1G(ipid, chassis.Outputs[num]));
 						if (typeName.StartsWith("dmrmc100c"))
 							return new DmRmcX100CController(key, name, new DmRmc100C(ipid, chassis.Outputs[num]));
+                        if (typeName.StartsWith("dmrmc100s"))
+                            return new DmRmc100SController(key, name, new DmRmc100S(ipid, chassis.Outputs[num]));
 						if (typeName.StartsWith("dmrmc4k100c"))
 							return new DmRmcX100CController(key, name, new DmRmc4k100C(ipid, chassis.Outputs[num]));
 						if (typeName.StartsWith("dmrmc4kz100c"))

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs

@@ -168,6 +168,8 @@ namespace PepperDash.Essentials.DM
 					&& tx.CvbsInput.SyncDetectedFeedback.BoolValue)
 			};
 
+            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
 
             DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
                 eRoutingPortConnectionType.DmCat, null, this);

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -55,7 +55,7 @@ namespace PepperDash.Essentials.DM
 				}
 				catch (Exception e)
 				{
-					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e.Message);
+					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e);
 				}
 			}
 			else
@@ -132,7 +132,7 @@ namespace PepperDash.Essentials.DM
 				}
 				catch (Exception e)
 				{
-					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e.Message);
+					Debug.Console(0, "[{0}] WARNING: Cannot create DM-TX device: {1}", key, e);
 				}
 			}
 			

essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj

@@ -1,163 +1,165 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9199CE8A-0C9F-4952-8672-3EED798B284F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials.DM</RootNamespace>
-    <AssemblyName>PepperDash_Essentials_DM</AssemblyName>
-    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
-    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
-    <OSVersion>5.0</OSVersion>
-    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <NativePlatformName>Windows CE</NativePlatformName>
-    <FormFactorID>
-    </FormFactorID>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <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>
-    </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>
-    </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>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.4.20530, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
-    </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>
-      <Private>False</Private>
-    </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>
-      <Private>False</Private>
-    </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>
-    </Reference>
-    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AirMedia\AirMediaPropertiesConfig.cs" />
-    <Compile Include="AirMedia\AirMediaController.cs" />
-    <Compile Include="Cards REMOVE\Dmc4kHdoSingleOutputCard.cs" />
-    <Compile Include="Cards REMOVE\Dmc4kCoHdSingleOutputCard.cs" />
-    <Compile Include="Cards REMOVE\DmOutputCardBase.cs" />
-    <Compile Include="Cards REMOVE\DmcC4kInputCard.cs" />
-    <Compile Include="Cards REMOVE\DmcHD4kInputCard.cs" />
-    <Compile Include="Cards REMOVE\DmInputCardBase.cs" />
-    <Compile Include="Chassis\DmCardAudioOutput.cs" />
-    <Compile Include="Chassis\DmChassisController.cs" />
-    <Compile Include="Chassis\DmpsInternalVirtualDmTxController.cs" />
-    <Compile Include="Chassis\DmpsRoutingController.cs" />
-    <Compile Include="Chassis\HdMdNxM4kEController.cs" />
-    <Compile Include="Config\DmpsRoutingConfig.cs" />
-    <Compile Include="Config\DmRmcConfig.cs" />
-    <Compile Include="Config\DmTxConfig.cs" />
-    <Compile Include="Config\DMChassisConfig.cs" />
-    <Compile Include="Config\HdMdNxM4kEPropertiesConfig.cs" />
-    <Compile Include="Config\InputPropertiesConfig.cs" />
-    <Compile Include="DmPortName.cs" />
-    <Compile Include="Endpoints\NVX\DmNvx35xController.cs" />
-    <Compile Include="Endpoints\NVX\DmNvxConfig.cs" />
-    <Compile Include="Endpoints\NVX\DmNvxControllerBase.cs" />
-    <Compile Include="Endpoints\DGEs\DgeController.cs" />
-    <Compile Include="Endpoints\DGEs\DgePropertiesConfig.cs" />
-    <Compile Include="Endpoints\Receivers\DmHdBaseTEndpointController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc100SController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc150SController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc200CController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc200S2Controller.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc200SController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc4k100C1GController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc4KScalerCController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmc4kScalerCDspController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmcScalerCController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmcX100CController.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmcHelper.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmcScalerS2Controller.cs" />
-    <Compile Include="Endpoints\Receivers\DmRmcScalerSController.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTx200Controller.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTx401CController.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTx4k100Controller.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTx4k202CController.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTx4k302CController.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTx201CController.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTx4kz302CController.cs" />
-    <Compile Include="Endpoints\Transmitters\DmTxHelpers.cs" />
-    <Compile Include="Extensions.cs" />
-    <Compile Include="Config\DeviceFactory.cs" />
-    <Compile Include="IDmHdmiInputExtensions.cs" />
-    <Compile Include="MOVE IBasicVideoStatusFeedbacks.cs" />
-    <Compile Include="Nvx\NvxDirectorController.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="VideoStatusHelpers.cs" />
-    <None Include="app.config" />
-    <None Include="Properties\ControlSystem.cfg" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
-      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
-      <Name>PepperDash_Essentials_Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
-  </PropertyGroup>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9199CE8A-0C9F-4952-8672-3EED798B284F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PepperDash.Essentials.DM</RootNamespace>
+    <AssemblyName>PepperDash_Essentials_DM</AssemblyName>
+    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
+    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
+    <OSVersion>5.0</OSVersion>
+    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <NativePlatformName>Windows CE</NativePlatformName>
+    <FormFactorID>
+    </FormFactorID>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <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>
+    </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>
+    </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>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="PepperDash_Core, Version=1.0.4.20530, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
+    </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>
+      <Private>False</Private>
+    </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>
+      <Private>False</Private>
+    </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>
+    </Reference>
+    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AirMedia\AirMediaPropertiesConfig.cs" />
+    <Compile Include="AirMedia\AirMediaController.cs" />
+    <Compile Include="Cards REMOVE\Dmc4kHdoSingleOutputCard.cs" />
+    <Compile Include="Cards REMOVE\Dmc4kCoHdSingleOutputCard.cs" />
+    <Compile Include="Cards REMOVE\DmOutputCardBase.cs" />
+    <Compile Include="Cards REMOVE\DmcC4kInputCard.cs" />
+    <Compile Include="Cards REMOVE\DmcHD4kInputCard.cs" />
+    <Compile Include="Cards REMOVE\DmInputCardBase.cs" />
+    <Compile Include="Chassis\DmCardAudioOutput.cs" />
+    <Compile Include="Chassis\DmChassisController.cs" />
+    <Compile Include="Chassis\DmpsAudioOutputController.cs" />
+    <Compile Include="Chassis\DmpsInternalVirtualDmTxController.cs" />
+    <Compile Include="Chassis\DmpsRoutingController.cs" />
+    <Compile Include="Chassis\HdMdNxM4kEController.cs" />
+    <Compile Include="Config\DmpsRoutingConfig.cs" />
+    <Compile Include="Config\DmRmcConfig.cs" />
+    <Compile Include="Config\DmTxConfig.cs" />
+    <Compile Include="Config\DMChassisConfig.cs" />
+    <Compile Include="Config\HdMdNxM4kEPropertiesConfig.cs" />
+    <Compile Include="Config\InputPropertiesConfig.cs" />
+    <Compile Include="DmPortName.cs" />
+    <Compile Include="Endpoints\NVX\DmNvx35xController.cs" />
+    <Compile Include="Endpoints\NVX\DmNvxConfig.cs" />
+    <Compile Include="Endpoints\NVX\DmNvxControllerBase.cs" />
+    <Compile Include="Endpoints\DGEs\DgeController.cs" />
+    <Compile Include="Endpoints\DGEs\DgePropertiesConfig.cs" />
+    <Compile Include="DmLite\HdMdxxxCEController.cs" />
+    <Compile Include="Endpoints\Receivers\DmHdBaseTEndpointController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc100SController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc150SController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc200CController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc200S2Controller.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc200SController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc4k100C1GController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc4KScalerCController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmc4kScalerCDspController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcScalerCController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcX100CController.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcHelper.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcScalerS2Controller.cs" />
+    <Compile Include="Endpoints\Receivers\DmRmcScalerSController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx200Controller.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx401CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4k100Controller.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4k202CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4k302CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx201CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTx4kz302CController.cs" />
+    <Compile Include="Endpoints\Transmitters\DmTxHelpers.cs" />
+    <Compile Include="Extensions.cs" />
+    <Compile Include="Config\DeviceFactory.cs" />
+    <Compile Include="IDmHdmiInputExtensions.cs" />
+    <Compile Include="MOVE IBasicVideoStatusFeedbacks.cs" />
+    <Compile Include="Nvx\NvxDirectorController.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VideoStatusHelpers.cs" />
+    <None Include="app.config" />
+    <None Include="Properties\ControlSystem.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
+      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
+      <Name>PepperDash_Essentials_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+  <PropertyGroup>
+    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
+  </PropertyGroup>
 </Project>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -1,205 +1,205 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{892B761C-E479-44CE-BD74-243E9214AF13}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials.Devices.Common</RootNamespace>
-    <AssemblyName>Essentials Devices Common</AssemblyName>
-    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
-    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
-    <OSVersion>5.0</OSVersion>
-    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <NativePlatformName>Windows CE</NativePlatformName>
-    <FormFactorID>
-    </FormFactorID>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <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>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.Lighting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.4.20530, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
-    </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>
-      <Private>False</Private>
-    </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>
-      <Private>False</Private>
-    </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>
-    </Reference>
-    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
-      <Private>False</Private>
-    </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>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AudioCodec\AudioCodecBase.cs" />
-    <Compile Include="AudioCodec\Interfaces\IAudioCodecInfo.cs" />
-    <Compile Include="AudioCodec\Interfaces\IHasAudioCodec.cs" />
-    <Compile Include="AudioCodec\MockAC\MockAC.cs" />
-    <Compile Include="AudioCodec\MockAC\MockAcPropertiesConfig.cs" />
-    <Compile Include="Cameras\CameraBase.cs" />
-    <Compile Include="Cameras\CameraVisca.cs" />
-    <Compile Include="Codec\eCodecCallDirection.cs" />
-    <Compile Include="Codec\eCodecCallType.cs" />
-    <Compile Include="Codec\eCodecCallStatus.cs" />
-    <Compile Include="Codec\eMeetingPrivacy.cs" />
-    <Compile Include="Codec\iCodecAudio.cs" />
-    <Compile Include="ImageProcessors\TVOneCorio.cs" />
-    <Compile Include="ImageProcessors\TVOneCorioPropertiesConfig.cs" />
-    <Compile Include="Power Controllers\Digitallogger.cs" />
-    <Compile Include="Power Controllers\DigitalLoggerPropertiesConfig.cs" />
-    <Compile Include="Evertz\EvertsEndpointStatusServer.cs" />
-    <Compile Include="Evertz\EvertzEndpointVarIds.cs" />
-    <Compile Include="Evertz\EvertzEndpoint.cs" />
-    <Compile Include="Evertz\EvertzEndpointPropertiesConfig.cs" />
-    <Compile Include="Evertz\GenericHttpClient.cs" />
-    <Compile Include="ImageProcessors\AnalogWay\AnalongWayLiveCore.cs" />
-    <Compile Include="ImageProcessors\AnalogWay\AnalogWayLiveCorePropertiesConfig.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\CiscoCamera.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
-    <Compile Include="VideoCodec\Interfaces\CameraControl.cs" />
-    <Compile Include="Display\PanasonicThDisplay.cs" />
-    <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
-    <Compile Include="Codec\iHasCallFavorites.cs" />
-    <Compile Include="Codec\iHasCallHistory.cs" />
-    <Compile Include="Codec\iHasContentSharing.cs" />
-    <Compile Include="Codec\iHasDialer.cs" />
-    <Compile Include="Codec\iHasDirectory.cs" />
-    <Compile Include="Codec\iHasScheduleAwareness.cs" />
-    <Compile Include="Crestron\Gateways\CenRfgwController.cs" />
-    <Compile Include="Display\ComTcpDisplayBase.cs" />
-    <Compile Include="Display\AvocorVTFDisplay.cs" />
-    <Compile Include="Display\InputInterfaces.cs" />
-    <Compile Include="Display\SamsungMDCDisplay.cs" />
-    <Compile Include="Display\DeviceFactory.cs" />
-    <Compile Include="Display\NecPaSeriesProjector.cs" />
-    <Compile Include="Display\NECPSXMDisplay.cs" />
-    <Compile Include="DSP\BiampTesira\BiampTesiraForteDspLevel.cs" />
-    <Compile Include="DSP\BiampTesira\TesiraForteControlPoint.cs" />
-    <Compile Include="DSP\BiampTesira\TesiraForteMuteControl.cs" />
-    <Compile Include="DSP\DspBase.cs" />
-    <Compile Include="DSP\BiampTesira\BiampTesiraForteDsp.cs" />
-    <Compile Include="DSP\BiampTesira\BiampTesiraFortePropertiesConfig.cs" />
-    <Compile Include="DSP\PolycomSoundStructure\SoundStructureBasics.cs" />
-    <Compile Include="Environment\Crestron Lighting\Din8sw8.cs" />
-    <Compile Include="Environment\Lutron\LutronQuantum.cs" />
-    <Compile Include="Environment\Somfy\RelayControlledShade.cs" />
-    <Compile Include="Factory\DeviceFactory.cs" />
-    <Compile Include="Generic\GenericSource.cs" />
-    <Compile Include="Microphone\MicrophonePrivacyController.cs" />
-    <Compile Include="Microphone\MicrophonePrivacyControllerConfig.cs" />
-    <Compile Include="Occupancy\EssentialsGlsOccupancySensorBaseController.cs" />
-    <Compile Include="Occupancy\EssentialsOccupancyAggregator.cs" />
-    <Compile Include="Occupancy\iOccupancyStatusProvider.cs" />
-    <Compile Include="PC\InRoomPc.cs" />
-    <Compile Include="PC\Laptop.cs" />
-    <Compile Include="SetTopBox\SetTopBoxPropertiesConfig.cs" />
-    <Compile Include="Streaming\AppleTV.cs" />
-    <Compile Include="Audio\GenericAudioOut.cs" />
-    <Compile Include="DiscPlayer\IRDiscPlayerBase.cs" />
-    <Compile Include="SetTopBox\IRSetTopBoxBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Streaming\Roku.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\BookingsDataClasses.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\CallHistoryDataClasses.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodec.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodecPropertiesConfig.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\xStatusSparkPlus.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasVideoCodec.cs" />
-    <Compile Include="VideoCodec\MockVC\MockCodecDirectory.cs" />
-    <Compile Include="VideoCodec\MockVC\MockVCCamera.cs" />
-    <Compile Include="VideoCodec\MockVC\MockVcPropertiesConfig.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\PhonebookDataClasses.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\xConfiguration.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\xEvent.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\HttpApiServer.cs" />
-    <Compile Include="Codec\CodecActiveCallItem.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasCodecLayouts.cs" />
-    <Compile Include="VideoCodec\Interfaces\IHasCodecSelfview.cs" />
-    <Compile Include="VideoCodec\MockVC\MockVC.cs" />
-    <Compile Include="VideoCodec\CiscoCodec\xStatus.cs" />
-    <Compile Include="VideoCodec\VideoCodecBase.cs" />
-    <Compile Include="VideoCodec\ZoomRoom\ResponseObjects.cs" />
-    <Compile Include="VideoCodec\ZoomRoom\ZoomRoom.cs" />
-    <Compile Include="VideoCodec\ZoomRoom\ZoomRoomCamera.cs" />
-    <Compile Include="VideoCodec\ZoomRoom\ZoomRoomPropertiesConfig.cs" />
-    <None Include="Properties\ControlSystem.cfg" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
-      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
-      <Name>PepperDash_Essentials_Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
-  </PropertyGroup>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{892B761C-E479-44CE-BD74-243E9214AF13}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PepperDash.Essentials.Devices.Common</RootNamespace>
+    <AssemblyName>Essentials Devices Common</AssemblyName>
+    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
+    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
+    <OSVersion>5.0</OSVersion>
+    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <NativePlatformName>Windows CE</NativePlatformName>
+    <FormFactorID>
+    </FormFactorID>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <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>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.Lighting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="PepperDash_Core, Version=1.0.4.20530, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
+    </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>
+      <Private>False</Private>
+    </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>
+      <Private>False</Private>
+    </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>
+    </Reference>
+    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <Private>False</Private>
+    </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>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AudioCodec\AudioCodecBase.cs" />
+    <Compile Include="AudioCodec\Interfaces\IAudioCodecInfo.cs" />
+    <Compile Include="AudioCodec\Interfaces\IHasAudioCodec.cs" />
+    <Compile Include="AudioCodec\MockAC\MockAC.cs" />
+    <Compile Include="AudioCodec\MockAC\MockAcPropertiesConfig.cs" />
+    <Compile Include="Cameras\CameraBase.cs" />
+    <Compile Include="Cameras\CameraVisca.cs" />
+    <Compile Include="Codec\eCodecCallDirection.cs" />
+    <Compile Include="Codec\eCodecCallType.cs" />
+    <Compile Include="Codec\eCodecCallStatus.cs" />
+    <Compile Include="Codec\eMeetingPrivacy.cs" />
+    <Compile Include="Codec\iCodecAudio.cs" />
+    <Compile Include="ImageProcessors\TVOneCorio.cs" />
+    <Compile Include="ImageProcessors\TVOneCorioPropertiesConfig.cs" />
+    <Compile Include="Power Controllers\Digitallogger.cs" />
+    <Compile Include="Power Controllers\DigitalLoggerPropertiesConfig.cs" />
+    <Compile Include="Evertz\EvertsEndpointStatusServer.cs" />
+    <Compile Include="Evertz\EvertzEndpointVarIds.cs" />
+    <Compile Include="Evertz\EvertzEndpoint.cs" />
+    <Compile Include="Evertz\EvertzEndpointPropertiesConfig.cs" />
+    <Compile Include="Evertz\GenericHttpClient.cs" />
+    <Compile Include="ImageProcessors\AnalogWay\AnalongWayLiveCore.cs" />
+    <Compile Include="ImageProcessors\AnalogWay\AnalogWayLiveCorePropertiesConfig.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\CiscoCamera.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
+    <Compile Include="Cameras\CameraControl.cs" />
+    <Compile Include="Display\PanasonicThDisplay.cs" />
+    <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
+    <Compile Include="Codec\iHasCallFavorites.cs" />
+    <Compile Include="Codec\iHasCallHistory.cs" />
+    <Compile Include="Codec\iHasContentSharing.cs" />
+    <Compile Include="Codec\iHasDialer.cs" />
+    <Compile Include="Codec\iHasDirectory.cs" />
+    <Compile Include="Codec\iHasScheduleAwareness.cs" />
+    <Compile Include="Crestron\Gateways\CenRfgwController.cs" />
+    <Compile Include="Display\ComTcpDisplayBase.cs" />
+    <Compile Include="Display\AvocorVTFDisplay.cs" />
+    <Compile Include="Display\InputInterfaces.cs" />
+    <Compile Include="Display\SamsungMDCDisplay.cs" />
+    <Compile Include="Display\DeviceFactory.cs" />
+    <Compile Include="Display\NecPaSeriesProjector.cs" />
+    <Compile Include="Display\NECPSXMDisplay.cs" />
+    <Compile Include="DSP\BiampTesira\BiampTesiraForteDspLevel.cs" />
+    <Compile Include="DSP\BiampTesira\TesiraForteControlPoint.cs" />
+    <Compile Include="DSP\BiampTesira\TesiraForteMuteControl.cs" />
+    <Compile Include="DSP\DspBase.cs" />
+    <Compile Include="DSP\BiampTesira\BiampTesiraForteDsp.cs" />
+    <Compile Include="DSP\BiampTesira\BiampTesiraFortePropertiesConfig.cs" />
+    <Compile Include="DSP\PolycomSoundStructure\SoundStructureBasics.cs" />
+    <Compile Include="Environment\Crestron Lighting\Din8sw8.cs" />
+    <Compile Include="Environment\Lutron\LutronQuantum.cs" />
+    <Compile Include="Environment\Somfy\RelayControlledShade.cs" />
+    <Compile Include="Factory\DeviceFactory.cs" />
+    <Compile Include="Generic\GenericSource.cs" />
+    <Compile Include="Microphone\MicrophonePrivacyController.cs" />
+    <Compile Include="Microphone\MicrophonePrivacyControllerConfig.cs" />
+    <Compile Include="Occupancy\EssentialsGlsOccupancySensorBaseController.cs" />
+    <Compile Include="Occupancy\EssentialsOccupancyAggregator.cs" />
+    <Compile Include="Occupancy\iOccupancyStatusProvider.cs" />
+    <Compile Include="PC\InRoomPc.cs" />
+    <Compile Include="PC\Laptop.cs" />
+    <Compile Include="SetTopBox\SetTopBoxPropertiesConfig.cs" />
+    <Compile Include="Streaming\AppleTV.cs" />
+    <Compile Include="Audio\GenericAudioOut.cs" />
+    <Compile Include="DiscPlayer\IRDiscPlayerBase.cs" />
+    <Compile Include="SetTopBox\IRSetTopBoxBase.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Streaming\Roku.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\BookingsDataClasses.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\CallHistoryDataClasses.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodec.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodecPropertiesConfig.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\xStatusSparkPlus.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasVideoCodec.cs" />
+    <Compile Include="VideoCodec\MockVC\MockCodecDirectory.cs" />
+    <Compile Include="VideoCodec\MockVC\MockVCCamera.cs" />
+    <Compile Include="VideoCodec\MockVC\MockVcPropertiesConfig.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\PhonebookDataClasses.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\xConfiguration.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\xEvent.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\HttpApiServer.cs" />
+    <Compile Include="Codec\CodecActiveCallItem.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasCodecLayouts.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasCodecSelfview.cs" />
+    <Compile Include="VideoCodec\MockVC\MockVC.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\xStatus.cs" />
+    <Compile Include="VideoCodec\VideoCodecBase.cs" />
+    <Compile Include="VideoCodec\ZoomRoom\ResponseObjects.cs" />
+    <Compile Include="VideoCodec\ZoomRoom\ZoomRoom.cs" />
+    <Compile Include="VideoCodec\ZoomRoom\ZoomRoomCamera.cs" />
+    <Compile Include="VideoCodec\ZoomRoom\ZoomRoomPropertiesConfig.cs" />
+    <None Include="Properties\ControlSystem.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
+      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
+      <Name>PepperDash_Essentials_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+  <PropertyGroup>
+    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
+  </PropertyGroup>
 </Project>