From f2bfeda074f7dc78df8f5b737ae32f2e33fbbfd1 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 26 Sep 2018 16:09:43 -0600 Subject: [PATCH] Tested DmChassisController over EiscApi bridge. So far, no issues found --- .../Bridges/DmChassisControllerBridge.cs | 17 +++++++++++------ essentials-framework | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs index 7d915169..bf38c4f0 100644 --- a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs +++ b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs @@ -22,6 +22,8 @@ namespace PepperDash.Essentials.Bridges joinMap.OffsetJoinNumbers(joinStart); + Debug.Console(1, dmChassis, "Linking device '{0}' to Trilist '{1}'", dmChassis.Key, trilist.ID); + dmChassis.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]); // Link up outputs @@ -61,8 +63,9 @@ namespace PepperDash.Essentials.Bridges public uint OutputCurrentVideoInputNames { get; set; } public uint OutputCurrentAudioInputNames { get; set; } public uint InputCurrentResolution { get; set; } - public uint HdcpSupport { get; set; } - public uint HdcpSupportCapability { get; set; } + public uint InputSlotOnline { get; set; } + //public uint HdcpSupport { get; set; } + //public uint HdcpSupportCapability { get; set; } public DmChassisControllerJoinMap() @@ -76,8 +79,9 @@ namespace PepperDash.Essentials.Bridges OutputCurrentVideoInputNames = 2000; //2001-2199 OutputCurrentAudioInputNames = 2200; //2201-2399 InputCurrentResolution = 2400; // 2401-2599 - HdcpSupport = 1000; //1001-1199 - HdcpSupportCapability = 1200; //1201-1399 + InputSlotOnline = 500; + //HdcpSupport = 1000; //1001-1199 + //HdcpSupportCapability = 1200; //1201-1399 } @@ -94,8 +98,9 @@ namespace PepperDash.Essentials.Bridges OutputCurrentVideoInputNames = OutputCurrentVideoInputNames + joinOffset; OutputCurrentAudioInputNames = OutputCurrentAudioInputNames + joinOffset; InputCurrentResolution = InputCurrentResolution + joinOffset; - HdcpSupport = HdcpSupport + joinOffset; - HdcpSupportCapability = HdcpSupportCapability + joinOffset; + InputSlotOnline = InputSlotOnline + joinOffset; + //HdcpSupport = HdcpSupport + joinOffset; + //HdcpSupportCapability = HdcpSupportCapability + joinOffset; } } } diff --git a/essentials-framework b/essentials-framework index dbb52a54..25af9c91 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit dbb52a5428d1cbdd96af7ede9e1d81d3faa52206 +Subproject commit 25af9c91a18fef1b0c287e4fcdfda4200cb24688