Adds back in the LightingBridge.

Removes the Display bridge

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -9,27 +9,25 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.DM.AirMedia;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Bridges
 {
 	public static class AirMediaControllerApiExtensions
 	{
         public static void LinkToApi(this AirMediaController airMedia, BasicTriList trilist, uint joinStart, string joinMapKey)
 		{
-            AirMediaControllerJoinMap joinMap = new AirMediaControllerJoinMap();
+			var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as AirMediaControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<AirMediaControllerJoinMap>(joinMapSerialized);
+			if (joinMap == null)
+			{
+				joinMap = new AirMediaControllerJoinMap();
+			}
 
 			joinMap.OffsetJoinNumbers(joinStart);
 
 			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-			Debug.Console(0, "Linking to Airmedia: {0}", airMedia.Name);
+			Debug.Console(0, "Linking to Bridge Type {0}", airMedia.GetType().Name.ToString());
 
-			trilist.StringInput[joinMap.Name].StringValue = airMedia.Name;			
+			trilist.StringInput[joinMap.Name].StringValue = airMedia.GetType().Name.ToString();			
 
 			var commMonitor = airMedia as ICommunicationMonitor;
             if (commMonitor != null)
@@ -57,5 +55,68 @@ 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,20 +9,18 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Bridges
 {
     public static class AppleTvApiExtensions
     {
         public static void LinkToApi(this AppleTV appleTv, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            AppleTvJoinMap joinMap = new AppleTvJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as AppleTvJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if(!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<AppleTvJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+            {
+                joinMap = new AppleTvJoinMap();
+            }
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -38,4 +36,40 @@ 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,7 +12,6 @@ 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;
@@ -78,12 +77,7 @@ namespace PepperDash.Essentials.Bridges
 
                     if (device != null)
                     {
-                        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)
+                        if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
                         {
                             (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
@@ -93,16 +87,16 @@ namespace PepperDash.Essentials.Bridges
                             (device as GenericComm).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-                        else if (device is CameraBase)
-                        {
-                            (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-						else if (device is PepperDash.Essentials.Core.DisplayBase)
-						{
-							(device as DisplayBase).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);
+						//    continue;
+						//}
                         else if (device is DmChassisController)
                         {
                             (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
@@ -143,21 +137,26 @@ namespace PepperDash.Essentials.Bridges
                             (device as AppleTV).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
+                        else if (device is IBridge)
+                        {
+                            (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
                         else if (device is HdMdxxxCEController)
                         {
                             (device as HdMdxxxCEController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-                        else if (device is LightingBase)
-                        {
-                            (device as LightingBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
-                        else if (device is DigitalLogger)
-                        {
-                            (device as DigitalLogger).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-                            continue;
-                        }
+						else if (device is 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,137 +1,187 @@
-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;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using Crestron.SimplSharp;
+//using Crestron.SimplSharpPro.DeviceSupport;
+//using PepperDash.Core;
+//using PepperDash.Essentials.Core;
+//using PepperDash.Essentials.Devices.Common;
 
-using Newtonsoft.Json;
+//namespace PepperDash.Essentials.Bridges
+//{
+//    public static class CameraControllerApiExtensions
+//    {
 
-namespace PepperDash.Essentials.Bridges
-{
-    public static class CameraControllerApiExtensions
-    {
+//        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());
 
-        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            CameraControllerJoinMap joinMap = new CameraControllerJoinMap();
+//            var commMonitor = cameraDevice as ICommunicationMonitor;
+//            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<CameraControllerJoinMap>(joinMapSerialized);
+//            trilist.SetBoolSigAction(JoinMap.Left, (b) =>
+//                {
+//                    if (b)
+//                    {
+//                        cameraDevice.PanLeft();
+//                    }
+//                    else
+//                    {
+//                        cameraDevice.Stop();
+//                    }
+//                });
+//            trilist.SetBoolSigAction(JoinMap.Right, (b) =>
+//            {
+//                if (b)
+//                {
+//                    cameraDevice.PanRight();
+//                }
+//                else
+//                {
+//                    cameraDevice.Stop();
+//                }
+//            });
 
-            joinMap.OffsetJoinNumbers(joinStart);
+//            trilist.SetBoolSigAction(JoinMap.Up, (b) =>
+//            {
+//                if (b)
+//                {
+//                    cameraDevice.TiltUp();
+//                }
+//                else
+//                {
+//                    cameraDevice.Stop();
+//                }
+//            });
+//            trilist.SetBoolSigAction(JoinMap.Down, (b) =>
+//            {
+//                if (b)
+//                {
+//                    cameraDevice.TiltDown();
+//                }
+//                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.ZoomIn, (b) =>
+//            {
+//                if (b)
+//                {
+//                    cameraDevice.ZoomIn();
+//                }
+//                else
+//                {
+//                    cameraDevice.Stop();
+//                }
+//            });
 
-            var commMonitor = cameraDevice as ICommunicationMonitor;
-            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+//            trilist.SetBoolSigAction(JoinMap.ZoomOut, (b) =>
+//            {
+//                if (b)
+//                {
+//                    cameraDevice.ZoomOut();
+//                }
+//                else
+//                {
+//                    cameraDevice.Stop();
+//                }
+//            });
 
-            var ptzCamera = cameraDevice as IHasCameraPtzControl;
 
-            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();
-                    }
-                });
+//            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());
 
-                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.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.PowerOn]);
+//                viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[JoinMap.PowerOff]);
 
-                trilist.SetBoolSigAction(joinMap.ZoomIn, (b) =>
-                {
-                    if (b)
-                    {
-                        ptzCamera.ZoomIn();
-                    }
-                    else
-                    {
-                        ptzCamera.ZoomStop();
-                    }
-                });
+//                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.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());
 
-                viscaCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
-                viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.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.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 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/DigitalLoggerBridge.cs

@@ -1,42 +1,77 @@
-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 Newtonsoft.Json;
+//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;
 
-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();
+//            if (joinMap == null)
+//                joinMap = new DigitalLoggerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+//            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));
 
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DigitalLoggerJoinMap>(joinMapSerialized);
+//            }
+//        }
+//    }
+//    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
+//        }
 
-            joinMap.OffsetJoinNumbers(joinStart);
+//        public override void OffsetJoinNumbers(uint joinStart)
+//        {
+//            var joinOffset = joinStart - 1;
 
-            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));
+//            IsOnline = IsOnline + joinOffset;
+//            CircuitNames = CircuitNames + joinOffset;
+//            CircuitState = CircuitState + joinOffset;
+//            CircuitCycle = CircuitCycle + joinOffset;
+//            CircuitIsCritical = CircuitIsCritical + joinOffset;
+//            CircuitOnCmd = CircuitOnCmd + joinOffset;
+//            CircuitOffCmd = CircuitOffCmd + joinOffset;
 
-            }
-        }
-    }
-}
+
+
+//        }
+//    }
+
+//}

PepperDashEssentials/Bridges/DisplayControllerBridge.cs

@@ -1,153 +1,225 @@
-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 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)
+//        {
+
+//                var joinmap = joinmaphelper.getjoinmapfordevice(joinmapkey) as displaycontrollerjoinmap;
+
+//                if (joinmap == null)
+//                {
+//                    joinmap = new displaycontrollerjoinmap();
+//                }
+
+//                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.linkinputsig(trilist.ushortinput[joinmap.inputselect]);
+//                // 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);
 
 
-namespace PepperDash.Essentials.Bridges
-{
-	public static class DisplayControllerApiExtensions
-	{
-		public static void LinkToApi(this PepperDash.Essentials.Core.DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-		{
-            int inputNumber = 0;
-            IntFeedback inputNumberFeedback;
-            List<string> inputKeys = new List<string>();
+                   
+//                }
 
-            DisplayControllerJoinMap joinMap = new DisplayControllerJoinMap();
+//                // power off
+//                trilist.setsigtrueaction(joinmap.poweroff, () =>
+//                    {
+//                        inputnumber = 102;
+//                        inputnumberfeedback.fireupdate();
+//                        displaydevice.poweroff();
+//                    });
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-            
-            if(!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DisplayControllerJoinMap>(joinMapSerialized);
+//                displaydevice.powerisonfeedback.outputchange += new eventhandler<feedbackeventargs>(powerisonfeedback_outputchange);
+//                displaydevice.powerisonfeedback.linkcomplementinputsig(trilist.booleaninput[joinmap.poweroff]);
 
-			joinMap.OffsetJoinNumbers(joinStart);
+//                // poweron
+//                trilist.setsigtrueaction(joinmap.poweron, () =>
+//                    {
+//                        inputnumber = 0;
+//                        inputnumberfeedback.fireupdate();
+//                        displaydevice.poweron();
+//                    });
 
-			Debug.Console(1, "Linking to Trilist '{0}'",trilist.ID.ToString("X"));
-			Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
+				
+//                displaydevice.powerisonfeedback.linkinputsig(trilist.booleaninput[joinmap.poweron]);
 
-            trilist.StringInput[joinMap.Name].StringValue = displayDevice.Name;			
+//                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++;
+//                }
 
-			var commMonitor = displayDevice as ICommunicationMonitor;
-            if (commMonitor != null)
-            {
-                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-            }
+//                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;
+//                            inputnumberfeedback.fireupdate();
+//                        }
+//                        else if (a > 0 && a < displaydevice.inputports.count )
+//                        {
+//                            displaydevice.executeswitch(displaydevice.inputports.elementat(a - 1).selector);
+//                            inputnumber = a;
+//                            inputnumberfeedback.fireupdate();
+//                        }
+//                        else if (a == 102)
+//                        {
+//                            displaydevice.powertoggle();
 
-            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]);
-            }
+//                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());
 
-			// Power Off
-			trilist.SetSigTrueAction(joinMap.PowerOff, () =>
-				{
-					inputNumber = 102;
-					inputNumberFeedback.FireUpdate();
-					displayDevice.PowerOff();
-				});
+//                    var volumedisplaywithfeedback = volumedisplay as ibasicvolumewithfeedback;
+//                    if(volumedisplaywithfeedback != null)
+//                    {
+//                        volumedisplaywithfeedback.volumelevelfeedback.linkinputsig(trilist.ushortinput[joinmap.volumelevelfb]);
+//                        volumedisplaywithfeedback.mutefeedback.linkinputsig(trilist.booleaninput[joinmap.volumemute]);
+//                    }
+//                }
+//            }
 
-			displayDevice.PowerIsOnFeedback.OutputChange += new EventHandler<FeedbackEventArgs>( (o,a) => {
-                if (!a.BoolValue)
-                {
-                    inputNumber = 102;
-                    inputNumberFeedback.FireUpdate();
+//        static void currentinputfeedback_outputchange(object sender, feedbackeventargs e)
+//        {
 
-                }
-                else
-                {
-                    inputNumber = 0;
-                    inputNumberFeedback.FireUpdate();
-                }
-            });
+//            debug.console(0, "currentinputfeedback_outputchange {0}", e.stringvalue);
 
-			displayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
+//        }
 
-			// PowerOn
-			trilist.SetSigTrueAction(joinMap.PowerOn, () =>
-				{
-					inputNumber = 0;
-					inputNumberFeedback.FireUpdate();
-					displayDevice.PowerOn();
-				});
+//        static void powerisonfeedback_outputchange(object sender, feedbackeventargs e)
+//        {
 
-			
-			displayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
+//            // debug.console(0, "powerisonfeedback_outputchange {0}",  e.boolvalue);
+//            if (!e.boolvalue)
+//            {
+//                inputnumber = 102;
+//                inputnumberfeedback.fireupdate();
 
-			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();
-			});
+//            }
+//            else
+//            {
+//                inputnumber = 0;
+//                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)
-		{
+//    }
+//    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; }
 
-			Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", e.StringValue);
+//        // 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,21 +12,16 @@ 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)
         {
-            DmChassisControllerJoinMap joinMap = new DmChassisControllerJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmChassisControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DmChassisControllerJoinMap>(joinMapSerialized);
-            
+            if (joinMap == null)
+                joinMap = new DmChassisControllerJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -51,13 +46,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
@@ -73,20 +68,18 @@ 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.VideoSyncStatus + ioSlot]);
+                        txDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + 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;
 
@@ -108,10 +101,10 @@ namespace PepperDash.Essentials.Bridges
                             }
                         }
                     }
-                }
-                else
-                {
-                    dmChassis.VideoInputSyncFeedbacks[ioSlot].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)
@@ -124,12 +117,12 @@ namespace PepperDash.Essentials.Bridges
                             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)
@@ -140,7 +133,7 @@ namespace PepperDash.Essentials.Bridges
                     {
                         RxDevice.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
                     }
-                }
+				}
 
                 // Feedback
                 dmChassis.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
@@ -148,6 +141,7 @@ namespace PepperDash.Essentials.Bridges
                 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]);
@@ -210,5 +204,90 @@ namespace PepperDash.Essentials.Bridges
             }
         }
 
+        public class DmChassisControllerJoinMap : JoinMapBase
+        {
+            // Digtal/Analog
+            public uint SystemId { get; set; }
+
+            //Digital
+            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()
+            {
+                //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
+                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,20 +9,16 @@ 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)
         {
-            DmRmcControllerJoinMap joinMap = new DmRmcControllerJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmRmcControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DmRmcControllerJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new DmRmcControllerJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -40,5 +36,40 @@ 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,20 +12,16 @@ 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)
         {
-            DmTxControllerJoinMap joinMap = new DmTxControllerJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmTxControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DmTxControllerJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new DmTxControllerJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -132,6 +128,46 @@ 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

@@ -10,20 +10,16 @@ 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 joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmpsAudioOutputControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DmpsAudioOutputControllerJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new DmpsAudioOutputControllerJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -54,10 +50,10 @@ namespace PepperDash.Essentials.Bridges
         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;
+            var muteOnJoin = joinStart + 1;
+            var muteOffJoin = joinStart + 2;
+            var volumeUpJoin = joinStart + 3;
+            var volumeDownJoin = joinStart + 4;
 
 
             trilist.SetUShortSigAction(volumeLevelJoin, new Action<ushort>(o => output.SetVolume(o)));
@@ -71,5 +67,33 @@ namespace PepperDash.Essentials.Bridges
             trilist.SetBoolSigAction(volumeUpJoin, new Action<bool>(b => output.VolumeUp(b)));
             trilist.SetBoolSigAction(volumeDownJoin, new Action<bool>(b => output.VolumeDown(b)));
         }
+
+        public class DmpsAudioOutputControllerJoinMap: JoinMapBase
+        {
+            // Digital
+            public uint MasterVolume { get; set; }
+            public uint SourceVolume { get; set; }
+            public uint Codec1Volume { get; set; }
+            public uint Codec2Volume { get; set; }
+
+
+            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 -1;
+
+                MasterVolume = MasterVolume + joinOffset;
+                SourceVolume = SourceVolume + joinOffset;
+                Codec1Volume = Codec1Volume + joinOffset;
+                Codec2Volume = Codec2Volume + joinOffset;
+            }
+        }
     }
 }

PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

@@ -10,20 +10,16 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Bridges
 {
     public static class DmpsRoutingControllerApiExtentions 
     {
         public static void LinkToApi(this DmpsRoutingController dmpsRouter, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            DmpsRoutingControllerJoinMap joinMap = new DmpsRoutingControllerJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmpsRoutingControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new DmpsRoutingControllerJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -124,5 +120,58 @@ 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; //501-699
+                OutputEndpointOnline = 700; //701-899
+                //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

@@ -8,67 +8,96 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common;
 
-using Newtonsoft.Json;
-
 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();
+	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;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+			if (joinMap == null)
+				joinMap = new GenericLightingJoinMap();
 
-            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; });
+			joinMap.OffsetJoinNumbers(joinStart);
+			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
 
-            /*
-            var lutronLights = lightingDevice as PepperDash.Essentials.Devices.Common.Environment.Lutron.LutronQuantumArea;
+
+			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));
+			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,24 +5,21 @@ 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)
         {
-            GenericRelayControllerJoinMap joinMap = new GenericRelayControllerJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as GenericRelayControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new GenericRelayControllerJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -48,4 +45,22 @@ 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

@@ -12,20 +12,16 @@ 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 joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as HdMdxxxCEControllerJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<HdMdxxxCEControllerJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new HdMdxxxCEControllerJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -61,6 +57,116 @@ namespace PepperDash.Essentials.Bridges
                 trilist.StringInput[joinMap.SourceNames + number].StringValue = input.Key;
             }
 
-        } 
+        }
+
+        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/IBasicCommunicationBridge.cs

@@ -8,20 +8,17 @@ 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)
         {
-            IBasicCommunicationJoinMap joinMap = new IBasicCommunicationJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as IBasicCommunicationJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+            if (joinMap == null)
+                joinMap = new IBasicCommunicationJoinMap();
 
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);
             joinMap.OffsetJoinNumbers(joinStart);
 
             if (comm.CommPort == null)
@@ -33,14 +30,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, new Action<string>(s => comm.SetPortConfig(s)));
-
+            trilist.SetStringSigAction(joinMap.SetPortConfig + 1, new Action<string>(s => comm.SetPortConfig(s)));
+        
 
             var sComm = comm.CommPort as ISocketStatus;
             if (sComm != null)
@@ -65,5 +62,46 @@ 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,23 +6,18 @@ 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)
         {
-            IDigitalInputJoinMap joinMap = new IDigitalInputJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as IDigitalInputApiJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new IDigitalInputApiJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
@@ -40,5 +35,25 @@ 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/JoinMapBase.cs

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

PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,136 +0,0 @@
-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,25 +9,20 @@ 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)
         {
-            SystemMonitorJoinMap joinMap = new SystemMonitorJoinMap();
+            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as SystemMonitorJoinMap;
 
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            if(!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<SystemMonitorJoinMap>(joinMapSerialized);
+            if (joinMap == null)
+                joinMap = new SystemMonitorJoinMap();
 
             joinMap.OffsetJoinNumbers(joinStart);
 
-            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-            Debug.Console(2, systemMonitorController, "Linking API starting at join: {0}", joinStart);
+            //Debug.Console(1, 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)));
@@ -38,13 +33,18 @@ 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,6 +63,88 @@ 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/PepperDashEssentials.csproj

@@ -134,22 +134,7 @@
     <Compile Include="Bridges\DmRmcControllerBridge.cs" />
     <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Bridges\IDigitalInputBridge.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\JoinMapBase.cs" />
     <Compile Include="Bridges\SystemMonitorBridge.cs" />
     <Compile Include="Configuration ORIGINAL\Builders\TPConfig.cs" />
     <Compile Include="Configuration ORIGINAL\Configuration.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/BasicConfig.cs

@@ -26,9 +26,6 @@ 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/PepperDash_Essentials_Core.csproj

@@ -134,7 +134,6 @@
     <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" />

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

@@ -120,7 +120,7 @@
     <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="VideoCodec\Interfaces\CameraControl.cs" />
     <Compile Include="Display\PanasonicThDisplay.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />