mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-02 06:14:52 +00:00
fix(wip): DmRmc4kzScalerC VideoWallModeFb not working
- reverted PepperDashCode ref for Essentials_DM to unversioned and latest release - fixed Scaler_OutputChange function params - added instantiation of VideoWallModeRawFeedback - feedback event trigger causing null ref exception TODO: -[] trace nullref exception cause -[] Link Fb to Api
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -89,6 +89,9 @@ namespace PepperDash.Essentials.DM
|
||||
|
||||
VideoOutputResolutionFeedback = new StringFeedback(() => _rmc.HdmiOutput.GetVideoResolutionString());
|
||||
|
||||
VideoWallModeRawFeedback = new IntFeedback("ScalerVideoWallModeRaw",
|
||||
() => (int)_rmc.Scaler.WallModeRawFeedback.UShortValue);
|
||||
|
||||
InputPorts = new RoutingPortCollection<RoutingInputPort> { DmIn, HdmiIn };
|
||||
OutputPorts = new RoutingPortCollection<RoutingOutputPort> { HdmiOut };
|
||||
|
||||
@@ -256,12 +259,12 @@ namespace PepperDash.Essentials.DM
|
||||
|
||||
#region IhasWallMode Members
|
||||
|
||||
public void SetWallMode(ushort walLMode)
|
||||
public void SetWallMode(ushort wallMode)
|
||||
{
|
||||
EndpointScalerOutput.eWall wallvalue;
|
||||
EndpointScalerOutput.eWall wallValue;
|
||||
|
||||
if (WallModes.TryGetValue(walLMode, out wallvalue))
|
||||
_rmc.Scaler.WallMode = wallvalue;
|
||||
if (WallModes.TryGetValue(wallMode, out wallValue))
|
||||
_rmc.Scaler.WallMode = wallValue;
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -271,7 +274,16 @@ namespace PepperDash.Essentials.DM
|
||||
_rmc.Scaler.WallModeRaw.UShortValue = wallMode;
|
||||
}
|
||||
|
||||
void Scaler_OutputChange(object scaler ScalerOutputEventArgs args)
|
||||
void Scaler_OutputChange(EndpointScalerOutput scalerOutput, ScalerOutputEventArgs args)
|
||||
{
|
||||
switch (args.EventId)
|
||||
{
|
||||
case ScalerOutputEventIds.WallModeFeedbackEventId:
|
||||
VideoWallModeRawFeedback.FireUpdate();
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -59,9 +59,9 @@
|
||||
<HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="PepperDash_Core, Version=1.3.1.3727, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="PepperDash_Core, Version=1.3.3.32940, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\PepperDashCore.1.3.1\lib\net35\PepperDash_Core.dll</HintPath>
|
||||
<HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
|
||||
Reference in New Issue
Block a user