Adds new joins to DmTxControllerJoinMap and associated bridge

This commit is contained in:
Neil Dorin
2020-02-20 15:32:49 -07:00
parent e894e2d1b4
commit b7f97dc146
4 changed files with 54 additions and 6 deletions

View File

@@ -57,7 +57,7 @@ namespace PepperDash.Essentials.Bridges
trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability; trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability;
if(txR.InputPorts[DmPortName.HdmiIn] != null) if (txR.InputPorts[DmPortName.HdmiIn] != null)
{ {
var inputPort = txR.InputPorts[DmPortName.HdmiIn]; var inputPort = txR.InputPorts[DmPortName.HdmiIn];
@@ -71,7 +71,7 @@ namespace PepperDash.Essentials.Bridges
SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist); SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist);
} }
} }
if (txR.InputPorts[DmPortName.HdmiIn1] != null) if (txR.InputPorts[DmPortName.HdmiIn1] != null)
{ {
var inputPort = txR.InputPorts[DmPortName.HdmiIn1]; var inputPort = txR.InputPorts[DmPortName.HdmiIn1];
@@ -103,6 +103,22 @@ namespace PepperDash.Essentials.Bridges
} }
} }
var txFreeRun = tx as IHasFreeRun;
if (txFreeRun != null)
{
txFreeRun.FreeRunEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.FreeRunEnabled]);
trilist.SetBoolSigAction(joinMap.FreeRunEnabled, new Action<bool>(b => txFreeRun.SetFreeRunEnabled(b)));
}
var txVga = tx as IVgaBrightnessContrastControls;
{
txVga.VgaBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.VgaBrightness]);
txVga.VgaContrastFeedback.LinkInputSig(trilist.UShortInput[joinMap.VgaContrast]);
trilist.SetUShortSigAction(joinMap.VgaBrightness, new Action<ushort>(u => txVga.SetVgaBrightness(u)));
trilist.SetUShortSigAction(joinMap.VgaContrast, new Action<ushort>(u => txVga.SetVgaContrast(u)));
}
} }
static void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist) static void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist)

View File

@@ -18,6 +18,10 @@ namespace PepperDash.Essentials.Bridges
/// High when video sync is detected /// High when video sync is detected
/// </summary> /// </summary>
public uint VideoSyncStatus { get; set; } public uint VideoSyncStatus { get; set; }
/// <summary>
///
/// </summary>
public uint FreeRunEnabled { get; set; }
#endregion #endregion
#region Analogs #region Analogs
@@ -41,6 +45,16 @@ namespace PepperDash.Essentials.Bridges
/// Sets and reports the current HDCP state for the corresponding input port /// Sets and reports the current HDCP state for the corresponding input port
/// </summary> /// </summary>
public uint Port2HdcpState { get; set; } public uint Port2HdcpState { get; set; }
/// <summary>
/// Sets and reports the current VGA Brightness level
/// </summary>
public uint VgaBrightness { get; set; }
/// <summary>
/// Sets and reports the current VGA Contrast level
/// </summary>
public uint VgaContrast { get; set; }
#endregion #endregion
#region Serials #region Serials
@@ -56,6 +70,7 @@ namespace PepperDash.Essentials.Bridges
// Digital // Digital
IsOnline = 1; IsOnline = 1;
VideoSyncStatus = 2; VideoSyncStatus = 2;
FreeRunEnabled = 3;
// Serial // Serial
CurrentInputResolution = 1; CurrentInputResolution = 1;
// Analog // Analog
@@ -64,6 +79,8 @@ namespace PepperDash.Essentials.Bridges
HdcpSupportCapability = 3; HdcpSupportCapability = 3;
Port1HdcpState = 4; Port1HdcpState = 4;
Port2HdcpState = 5; Port2HdcpState = 5;
VgaBrightness = 6;
VgaContrast = 7;
} }
public override void OffsetJoinNumbers(uint joinStart) public override void OffsetJoinNumbers(uint joinStart)
@@ -72,12 +89,15 @@ namespace PepperDash.Essentials.Bridges
IsOnline = IsOnline + joinOffset; IsOnline = IsOnline + joinOffset;
VideoSyncStatus = VideoSyncStatus + joinOffset; VideoSyncStatus = VideoSyncStatus + joinOffset;
FreeRunEnabled = FreeRunEnabled + joinOffset;
CurrentInputResolution = CurrentInputResolution + joinOffset; CurrentInputResolution = CurrentInputResolution + joinOffset;
VideoInput = VideoInput + joinOffset; VideoInput = VideoInput + joinOffset;
AudioInput = AudioInput + joinOffset; AudioInput = AudioInput + joinOffset;
HdcpSupportCapability = HdcpSupportCapability + joinOffset; HdcpSupportCapability = HdcpSupportCapability + joinOffset;
Port1HdcpState = Port1HdcpState + joinOffset; Port1HdcpState = Port1HdcpState + joinOffset;
Port2HdcpState = Port2HdcpState + joinOffset; Port2HdcpState = Port2HdcpState + joinOffset;
VgaBrightness = VgaBrightness + joinOffset;
VgaContrast = VgaContrast + joinOffset;
} }
} }
} }

View File

@@ -23,6 +23,10 @@ namespace PepperDash.Essentials.Core
public StringFeedback TimeRemainingFeedback { get; private set; } public StringFeedback TimeRemainingFeedback { get; private set; }
public bool CountsDown { get; set; } public bool CountsDown { get; set; }
/// <summary>
/// The number of seconds to countdown
/// </summary>
public int SecondsToCount { get; set; } public int SecondsToCount { get; set; }
public DateTime StartTime { get; private set; } public DateTime StartTime { get; private set; }
@@ -31,7 +35,7 @@ namespace PepperDash.Essentials.Core
CTimer SecondTimer; CTimer SecondTimer;
/// <summary> /// <summary>
/// /// Constructor
/// </summary> /// </summary>
/// <param name="key"></param> /// <param name="key"></param>
public SecondsCountdownTimer(string key) public SecondsCountdownTimer(string key)
@@ -61,7 +65,7 @@ namespace PepperDash.Essentials.Core
} }
/// <summary> /// <summary>
/// /// Starts the Timer
/// </summary> /// </summary>
public void Start() public void Start()
{ {
@@ -82,7 +86,7 @@ namespace PepperDash.Essentials.Core
} }
/// <summary> /// <summary>
/// /// Restarts the timer
/// </summary> /// </summary>
public void Reset() public void Reset()
{ {
@@ -91,7 +95,7 @@ namespace PepperDash.Essentials.Core
} }
/// <summary> /// <summary>
/// /// Cancels the timer (without triggering it to finish)
/// </summary> /// </summary>
public void Cancel() public void Cancel()
{ {

View File

@@ -234,11 +234,19 @@ namespace PepperDash.Essentials.DM
} }
} }
/// <summary>
/// Sets the VGA brightness level
/// </summary>
/// <param name="level"></param>
public void SetVgaBrightness(ushort level) public void SetVgaBrightness(ushort level)
{ {
Tx.VgaInput.VideoControls.Brightness.UShortValue = level; Tx.VgaInput.VideoControls.Brightness.UShortValue = level;
} }
/// <summary>
/// Sets the VGA contrast level
/// </summary>
/// <param name="level"></param>
public void SetVgaContrast(ushort level) public void SetVgaContrast(ushort level)
{ {
Tx.VgaInput.VideoControls.Contrast.UShortValue = level; Tx.VgaInput.VideoControls.Contrast.UShortValue = level;