Adds control for DigitalLogger PDU Device

Adds EiscBridge for DigitalLogger PDU Device.

PepperDashEssentials/Bridges/BridgeBase.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.DM;
 
@@ -78,20 +79,25 @@ namespace PepperDash.Essentials.Bridges
                         {
                             (device as GenericComm).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 DmChassisController)
 						{
-                            (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+							// (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
 							continue;
 						}
 						else if (device is DmTxControllerBase)
 						{
-                            (device as DmTxControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+							// (device as DmTxControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
 							continue;
 						}
 						else if (device is DmRmcControllerBase)
 						{
-                            (device as DmRmcControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+							// (device as DmRmcControllerBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
 							continue;
 						}
                     }

PepperDashEssentials/Bridges/Bridges.BridgeFactory.cs

@@ -11,6 +11,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core.Routing;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.EthernetCommunication;
+using PepperDash.Essentials.Bridges;
 
 namespace PepperDash.Essentials {
 	public class BridgeFactory {
@@ -52,6 +53,10 @@ namespace PepperDash.Essentials {
 				Debug.Console(2, "Launch essentialslighting");
 				return new EssentialsLightsBridge(key, name, properties);
 			}
+			else if (typeName == "eiscapi") 
+            {
+			    return new EiscApi(dc);
+			}
 			return null;
 			}
 		}

PepperDashEssentials/Bridges/DigitalLoggerBridge.cs

@@ -25,6 +25,12 @@ namespace PepperDash.Essentials.Bridges
             {
                 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));
+
 			}
 		}
 	}
@@ -32,13 +38,22 @@ namespace PepperDash.Essentials.Bridges
 	{
 		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 = 1;
+			IsOnline = 9;
-
+			CircuitState = 0;
+			CircuitCycle = 0;
+			CircuitIsCritical = 10;
+			CircuitOnCmd = 10;
+			CircuitOffCmd = 20;
 			// Serial
-			CircuitNames = 1;
+			CircuitNames = 0;
 			// Analog
 		}
 
@@ -48,6 +63,14 @@ namespace PepperDash.Essentials.Bridges
 
 			IsOnline = IsOnline + joinOffset;
 			CircuitNames = CircuitNames + joinOffset;
+			CircuitState = CircuitState + joinOffset;
+			CircuitCycle = CircuitCycle + joinOffset;
+			CircuitIsCritical = CircuitIsCritical + joinOffset;
+			CircuitOnCmd = CircuitOnCmd + joinOffset;
+			CircuitOffCmd = CircuitOffCmd + joinOffset;
+
+
+
 		}
 	}
 

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public static class DmChassisControllerApiExtentions 
-    {
-        public static void LinkToApi(this DmChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmChassisControllerJoinMap;
-
-            if (joinMap == null)
-                joinMap = new DmChassisControllerJoinMap();
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, dmChassis, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            dmChassis.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-
-            // Link up outputs
-            for (uint i = 1; i <= dmChassis.Chassis.NumberOfOutputs - 1; i++)
-            {
-                var ioSlot = i;
-
-                // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video)));
-                trilist.SetUShortSigAction(joinMap.OutputAudio + ioSlot, new Action<ushort>(o => dmChassis.ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio)));
-
-                // Feedback
-                dmChassis.VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo + ioSlot]);
-                dmChassis.AudioOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputAudio + ioSlot]);
-
-                dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
-
-                dmChassis.OutputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputNames + ioSlot]);
-                dmChassis.InputNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.InputNames + ioSlot]);
-                dmChassis.OutputVideoRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentVideoInputNames + ioSlot]);
-                dmChassis.OutputAudioRouteNameFeedbacks[ioSlot].LinkInputSig(trilist.StringInput[joinMap.OutputCurrentAudioInputNames + ioSlot]);
-                dmChassis.InputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.InputEndpointOnline + ioSlot]);
-                dmChassis.OutputEndpointOnlineFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.OutputEndpointOnline + ioSlot]);
-
-
-            }
-        }
-
-
-        public class DmChassisControllerJoinMap : JoinMapBase
-        {
-            public uint IsOnline { get; set; }
-            public uint OutputVideo { get; set; }
-            public uint OutputAudio { get; set; }
-            public uint VideoSyncStatus { get; set; }
-            public uint InputNames { get; set; }
-            public uint OutputNames { get; set; }
-            public uint OutputCurrentVideoInputNames { get; set; }
-            public uint OutputCurrentAudioInputNames { get; set; }
-            public uint InputCurrentResolution { get; set; }
-            public uint InputEndpointOnline { get; set; }
-            public uint OutputEndpointOnline { get; set; }
-            //public uint HdcpSupport { get; set; }
-            //public uint HdcpSupportCapability { get; set; }
-
-
-            public DmChassisControllerJoinMap()
-            {
-                IsOnline = 11;
-                OutputVideo = 100; //101-299
-                OutputAudio = 300; //301-499
-                VideoSyncStatus = 100; //101-299
-                InputNames = 100; //101-299
-                OutputNames = 300; //301-499
-                OutputCurrentVideoInputNames = 2000; //2001-2199
-                OutputCurrentAudioInputNames = 2200; //2201-2399
-                InputCurrentResolution = 2400; // 2401-2599
-                InputEndpointOnline = 500;
-                OutputEndpointOnline = 700;
-                //HdcpSupport = 1000; //1001-1199
-               //HdcpSupportCapability = 1200; //1201-1399
-
-            }
-
-            public override void OffsetJoinNumbers(uint joinStart)
-            {
-                var joinOffset = joinStart - 1;
-
-                IsOnline = IsOnline + joinOffset;
-                OutputVideo = OutputVideo + joinOffset;
-                OutputAudio = OutputAudio + joinOffset;
-                VideoSyncStatus = VideoSyncStatus + joinOffset;
-                InputNames = InputNames + joinOffset;
-                OutputNames = OutputNames + joinOffset;
-                OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset;
-                OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset;
-                InputCurrentResolution = InputCurrentResolution + joinOffset;
-                InputEndpointOnline = InputEndpointOnline + joinOffset;
-                OutputEndpointOnline = OutputEndpointOnline + joinOffset;
-                //HdcpSupport = HdcpSupport + joinOffset;
-                //HdcpSupportCapability = HdcpSupportCapability + joinOffset;
-            }
-        }
-    }
-}

PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public static class DmRmcControllerApiExtensions
-    {
-        public static void LinkToApi(this DmRmcControllerBase rmc, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmRmcControllerJoinMap;
-
-            if (joinMap == null)
-                joinMap = new DmRmcControllerJoinMap();
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, rmc, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            rmc.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-            if(rmc.VideoOutputResolutionFeedback != null)
-                rmc.VideoOutputResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentOutputResolution]);
-            if(rmc.EdidManufacturerFeedback != null)
-                rmc.EdidManufacturerFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidManufacturer]);
-            if(rmc.EdidNameFeedback != null)
-                rmc.EdidNameFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidName]);
-            if(rmc.EdidPreferredTimingFeedback != null)
-                rmc.EdidPreferredTimingFeedback.LinkInputSig(trilist.StringInput[joinMap.EdidPrefferedTiming]);
-            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

@@ -1,173 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.DM;
-
-namespace PepperDash.Essentials.Bridges
-{
-    public static class DmTxControllerApiExtensions
-    {
-        public static void LinkToApi(this DmTxControllerBase tx, BasicTriList trilist, uint joinStart, string joinMapKey)
-        {
-            var joinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DmTxControllerJoinMap;
-
-            if (joinMap == null)
-                joinMap = new DmTxControllerJoinMap();
-
-            joinMap.OffsetJoinNumbers(joinStart);
-
-            Debug.Console(1, tx, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            tx.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
-            tx.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus]);
-            tx.AnyVideoInput.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentInputResolution]);
-            //tx.HdcpSupportAllFeedback.LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportCapability]);
-
-            bool hdcpTypeSimple;
-
-            if (tx.Hardware is DmTx4kX02CBase || tx.Hardware is DmTx4kzX02CBase)
-                hdcpTypeSimple = false;
-            else
-                hdcpTypeSimple = true;
-
-            if (tx is ITxRouting)
-            {
-                var txR = tx as ITxRouting;
-
-                trilist.SetUShortSigAction(joinMap.VideoInput,
-                    new Action<ushort>(i => txR.ExecuteNumericSwitch(i, 0, eRoutingSignalType.Video)));
-                trilist.SetUShortSigAction(joinMap.AudioInput,
-                    new Action<ushort>(i => txR.ExecuteNumericSwitch(i, 0, eRoutingSignalType.Audio)));
-
-                txR.VideoSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoInput]);
-                txR.AudioSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.AudioInput]);
-
-                trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability;
-
-                if(txR.InputPorts[DmPortName.HdmiIn] != null)
-                {
-                    var inputPort = txR.InputPorts[DmPortName.HdmiIn];
-
-                    if (tx.Feedbacks["HdmiInHdcpCapability"] != null)
-                        (tx.Feedbacks["HdmiInHdcpCapability"] as IntFeedback).LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState]);
-
-                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
-                    {
-                        var port = inputPort.Port as EndpointHdmiInput;
-
-                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist);
-                    }
-                }
-                
-                if (txR.InputPorts[DmPortName.HdmiIn1] != null)
-                {
-                    var inputPort = txR.InputPorts[DmPortName.HdmiIn1];
-
-                    if (tx.Feedbacks["HdmiIn1HdcpCapability"] != null)
-                        (tx.Feedbacks["HdmiIn1HdcpCapability"] as IntFeedback).LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState]);
-
-                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
-                    {
-                        var port = inputPort.Port as EndpointHdmiInput;
-
-                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist);
-                    }
-                }
-
-                if (txR.InputPorts[DmPortName.HdmiIn2] != null)
-                {
-                    var inputPort = txR.InputPorts[DmPortName.HdmiIn2];
-
-                    if (tx.Feedbacks["HdmiIn2HdcpCapability"] != null)
-                        (tx.Feedbacks["HdmiIn2HdcpCapability"] as IntFeedback).LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState]);
-
-                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
-                    {
-                        var port = inputPort.Port as EndpointHdmiInput;
-
-                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port2HdcpState, trilist);
-                    }
-                }
-
-            }
-        }
-
-        static void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist)
-        {
-            if (hdcpTypeSimple)
-            {
-                trilist.SetUShortSigAction(join,
-                    new Action<ushort>(s =>
-                    {
-                        if (s == 0)
-                        {
-                            port.HdcpSupportOff();
-                        }
-                        else if (s > 0)
-                        {
-                            port.HdcpSupportOn();
-                        }
-                    }));
-            }
-            else
-            {
-                trilist.SetUShortSigAction(join,
-                        new Action<ushort>(s =>
-                        {
-                            port.HdcpCapability = (eHdcpCapabilityType)s;
-                        }));
-            }
-        }
-
-        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/PepperDashEssentials.csproj

@@ -108,9 +108,6 @@
     <Compile Include="Bridges\BridgeBase.cs" />
     <Compile Include="Bridges\Bridges.BridgeFactory.cs" />
     <Compile Include="Bridges\DigitalLoggerBridge.cs" />
-    <Compile Include="Bridges\DmChassisControllerBridge.cs" />
-    <Compile Include="Bridges\DmRmcControllerBridge.cs" />
-    <Compile Include="Bridges\DmTxControllerBridge.cs" />
     <Compile Include="Bridges\EssentialsLightsBridge.cs" />
     <Compile Include="Bridges\EssentialTVOne.cs" />
     <Compile Include="Bridges\EssentialDsp.cs" />