mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-15 12:44:58 +00:00
feat: add video wall mode command to dm-rmc-4kz-scaler-c
This commit is contained in:
BIN
PepperDashCore.1.3.1/.signature.p7s
Normal file
BIN
PepperDashCore.1.3.1/.signature.p7s
Normal file
Binary file not shown.
BIN
PepperDashCore.1.3.1/lib/net35/PepperDash_Core.clz
Normal file
BIN
PepperDashCore.1.3.1/lib/net35/PepperDash_Core.clz
Normal file
Binary file not shown.
BIN
PepperDashCore.1.3.1/lib/net35/PepperDash_Core.dll
Normal file
BIN
PepperDashCore.1.3.1/lib/net35/PepperDash_Core.dll
Normal file
Binary file not shown.
6857
PepperDashCore.1.3.1/lib/net35/PepperDash_Core.xml
Normal file
6857
PepperDashCore.1.3.1/lib/net35/PepperDash_Core.xml
Normal file
File diff suppressed because it is too large
Load Diff
BIN
PepperDashCore.1.3.1/lib/net47/PepperDash_Core.clz
Normal file
BIN
PepperDashCore.1.3.1/lib/net47/PepperDash_Core.clz
Normal file
Binary file not shown.
BIN
PepperDashCore.1.3.1/lib/net47/PepperDash_Core.dll
Normal file
BIN
PepperDashCore.1.3.1/lib/net47/PepperDash_Core.dll
Normal file
Binary file not shown.
6857
PepperDashCore.1.3.1/lib/net47/PepperDash_Core.xml
Normal file
6857
PepperDashCore.1.3.1/lib/net47/PepperDash_Core.xml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -70,7 +70,11 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
|
|
||||||
[JoinName("ScalerOutWallMode")]
|
[JoinName("ScalerOutWallMode")]
|
||||||
public JoinDataComplete ScalerOutWallMode = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
|
public JoinDataComplete ScalerOutWallMode = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
|
||||||
new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
|
new JoinMetadata { Description = "Set Wall Mode for Scaler video Wall mode", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
|
||||||
|
|
||||||
|
[JoinName("ScalerOutWallModeRaw")]
|
||||||
|
public JoinDataComplete ScalerOutWallModeRaw = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
|
||||||
|
new JoinMetadata { Description = "Set Wall Mode for Scaler video Wall mode", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constructor to use when instantiating this Join Map without inheriting from it
|
/// Constructor to use when instantiating this Join Map without inheriting from it
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ namespace PepperDash_Essentials_DM
|
|||||||
|
|
||||||
public interface IhasWallMode
|
public interface IhasWallMode
|
||||||
{
|
{
|
||||||
void SeteWallMode(ushort walLMode);
|
void SetWallMode(ushort walLMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -27,6 +27,7 @@ namespace PepperDash.Essentials.DM
|
|||||||
public IntFeedback DmInHdcpStateFeedback { get; private set; }
|
public IntFeedback DmInHdcpStateFeedback { get; private set; }
|
||||||
public IntFeedback HdmiInHdcpStateFeedback { get; private set; }
|
public IntFeedback HdmiInHdcpStateFeedback { get; private set; }
|
||||||
|
|
||||||
|
|
||||||
public BoolFeedback HdmiVideoSyncFeedback { get; private set; }
|
public BoolFeedback HdmiVideoSyncFeedback { get; private set; }
|
||||||
|
|
||||||
private Dictionary<ushort, EndpointScalerOutput.eWall> WallModes;
|
private Dictionary<ushort, EndpointScalerOutput.eWall> WallModes;
|
||||||
@@ -95,6 +96,7 @@ namespace PepperDash.Essentials.DM
|
|||||||
_rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
|
_rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
|
||||||
_rmc.HdmiIn.InputStreamChange += InputStreamChangeEvent;
|
_rmc.HdmiIn.InputStreamChange += InputStreamChangeEvent;
|
||||||
_rmc.DmInput.InputStreamChange += InputStreamChangeEvent;
|
_rmc.DmInput.InputStreamChange += InputStreamChangeEvent;
|
||||||
|
_rmc.Scaler.OutputChange += Scaler_OutputChange;
|
||||||
|
|
||||||
_rmc.OnlineStatusChange += _rmc_OnlineStatusChange;
|
_rmc.OnlineStatusChange += _rmc_OnlineStatusChange;
|
||||||
|
|
||||||
@@ -254,7 +256,7 @@ namespace PepperDash.Essentials.DM
|
|||||||
|
|
||||||
#region IhasWallMode Members
|
#region IhasWallMode Members
|
||||||
|
|
||||||
public void SeteWallMode(ushort walLMode)
|
public void SetWallMode(ushort walLMode)
|
||||||
{
|
{
|
||||||
EndpointScalerOutput.eWall wallvalue;
|
EndpointScalerOutput.eWall wallvalue;
|
||||||
|
|
||||||
@@ -263,5 +265,13 @@ namespace PepperDash.Essentials.DM
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
public void SetWallModeRaw(ushort wallMode)
|
||||||
|
{
|
||||||
|
_rmc.Scaler.WallModeRaw.UShortValue = wallMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Scaler_OutputChange(object scaler ScalerOutputEventArgs args)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -28,6 +28,9 @@ namespace PepperDash.Essentials.DM
|
|||||||
public StringFeedback EdidPreferredTimingFeedback { get; protected set; }
|
public StringFeedback EdidPreferredTimingFeedback { get; protected set; }
|
||||||
public StringFeedback EdidSerialNumberFeedback { get; protected set; }
|
public StringFeedback EdidSerialNumberFeedback { get; protected set; }
|
||||||
|
|
||||||
|
public IntFeedback VideoWallModeFeedback { get; protected set; }
|
||||||
|
public IntFeedback VideoWallModeRawFeedback { get; protected set; }
|
||||||
|
|
||||||
protected DmRmcControllerBase(string key, string name, EndpointReceiverBase device)
|
protected DmRmcControllerBase(string key, string name, EndpointReceiverBase device)
|
||||||
: base(key, name, device)
|
: base(key, name, device)
|
||||||
{
|
{
|
||||||
@@ -167,8 +170,19 @@ namespace PepperDash.Essentials.DM
|
|||||||
trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber,
|
trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber,
|
||||||
a => routingWithFeedback.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
|
a => routingWithFeedback.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
|
||||||
|
|
||||||
|
var dmRmcScalerWithVideowall = rmc as DmRmc4kZScalerCController;
|
||||||
|
|
||||||
|
if (dmRmcScalerWithVideowall != null)
|
||||||
|
{
|
||||||
|
trilist.SetUShortSigAction(joinMap.ScalerOutWallMode.JoinNumber, a => dmRmcScalerWithVideowall.SetWallMode(a));
|
||||||
|
trilist.SetUShortSigAction(joinMap.ScalerOutWallModeRaw.JoinNumber, a => dmRmcScalerWithVideowall.SetWallModeRaw(a));
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#region Implementation of IDeviceInfoProvider
|
#region Implementation of IDeviceInfoProvider
|
||||||
|
|
||||||
public DeviceInfo DeviceInfo { get; private set; }
|
public DeviceInfo DeviceInfo { get; private set; }
|
||||||
|
|||||||
@@ -59,9 +59,9 @@
|
|||||||
<HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
|
<HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="mscorlib" />
|
<Reference Include="mscorlib" />
|
||||||
<Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="PepperDash_Core, Version=1.3.1.3727, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
|
<HintPath>..\..\..\PepperDashCore.1.3.1\lib\net35\PepperDash_Core.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
|
<Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
|||||||
Reference in New Issue
Block a user