mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-01-27 19:34:51 +00:00
Compare commits
3 Commits
v1.16.1
...
1.15.5-alp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2850920d6e | ||
|
|
a5de8b14d9 | ||
|
|
9d71810e04 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -390,3 +390,4 @@ MigrationBackup/
|
||||
FodyWeavers.xsd
|
||||
essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
|
||||
.DS_Store
|
||||
._.DS_Store
|
||||
|
||||
@@ -91,8 +91,8 @@ we receive and the availability of resources to evaluate contributions, we antic
|
||||
project remains dynamic and relevant. This may affect our responsiveness and ability to accept pull requests
|
||||
quickly. This does not mean we are ignoring them.
|
||||
- Not all innovative ideas need to be accepted as pull requests into this GitHub project to be valuable to the community.
|
||||
There may be times when we recommend that you just share your code for some enhancement to Essentials from your own
|
||||
repository. As we identify and recognize extensions that are of general interest to Essentials, we
|
||||
There may be times when we recommend that you just share your code for some enhancement to Ghidra from your own
|
||||
repository. As we identify and recognize extensions that are of general interest to the reverse engineering community, we
|
||||
may seek to incorporate them with our baseline.
|
||||
|
||||
## Legal
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace PepperDash.Essentials.Bridges
|
||||
catch (NullReferenceException)
|
||||
{
|
||||
Debug.ConsoleWithLog(0, this,
|
||||
"Please update the bridge config to use eiscApiAdvanced with this device: {0}", device.Key);
|
||||
"Please update the bridge config to use EiscBridgeAdvanced with this device: {0}", device.Key);
|
||||
}
|
||||
}
|
||||
Debug.Console(1, this, "Devices Linked.");
|
||||
|
||||
@@ -20,18 +20,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
||||
public JoinDataComplete AutomaticInputRoutingEnabled = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
|
||||
new JoinMetadata { Description = "Air Media Automatic Input Routing Enable(d)", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
|
||||
|
||||
[JoinName("HdmiInHdcpSupportOn")]
|
||||
public JoinDataComplete HdmiInHdcpSupportOn = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
|
||||
new JoinMetadata { Description = "Turns on HDCP support for HDMI in. Reports state as FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
|
||||
|
||||
[JoinName("HdmiInHdcpSupportOff")]
|
||||
public JoinDataComplete HdmiInHdcpSupportOff = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
|
||||
new JoinMetadata { Description = "Turns off HDCP support for HDMI in. Reports state as FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
|
||||
|
||||
[JoinName("HdmiInDisabledByHdcp")]
|
||||
public JoinDataComplete HdmiInDisabledByHdcp = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
|
||||
new JoinMetadata { Description = "Reports if ", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
|
||||
|
||||
[JoinName("VideoOut")]
|
||||
public JoinDataComplete VideoOut = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
|
||||
new JoinMetadata { Description = "Air Media Video Route Select / Feedback", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using Crestron.SimplSharpPro;
|
||||
using Crestron.SimplSharpPro.GeneralIO;
|
||||
using PepperDash.Core;
|
||||
using PepperDash.Essentials.Core.Config;
|
||||
|
||||
namespace PepperDash.Essentials.Core.CrestronIO
|
||||
{
|
||||
/// <summary>
|
||||
/// Wrapper class for CEN-IO-COM-Xxx expander module
|
||||
/// </summary>
|
||||
[Description("Wrapper class for the CEN-IO-COM-102 & CEN-IO-COM-202 expander module")]
|
||||
public class CenIoComController : CrestronGenericBaseDevice, IComPorts
|
||||
{
|
||||
private readonly CenIoCom _cenIoCom;
|
||||
|
||||
public CenIoComController(string key, string name, CenIoCom cenIo)
|
||||
:base(key, name, cenIo)
|
||||
{
|
||||
_cenIoCom = cenIo;
|
||||
}
|
||||
|
||||
#region Implementation of IComPorts
|
||||
|
||||
public CrestronCollection<ComPort> ComPorts
|
||||
{
|
||||
get { return _cenIoCom.ComPorts; }
|
||||
}
|
||||
|
||||
public int NumberOfComPorts
|
||||
{
|
||||
get { return _cenIoCom.NumberOfComPorts; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
public class CenIoCom102ControllerFactory : EssentialsDeviceFactory<CenIoComController>
|
||||
{
|
||||
private const string CenIoCom102Type = "ceniocom102";
|
||||
private const string CenIoCom202Type = "ceniocom202";
|
||||
|
||||
public CenIoCom102ControllerFactory()
|
||||
{
|
||||
TypeNames = new List<string> { CenIoCom102Type, CenIoCom202Type };
|
||||
}
|
||||
|
||||
public override EssentialsDevice BuildDevice(DeviceConfig dc)
|
||||
{
|
||||
Debug.Console(1, "Factory Attempting to create new CEN-IO-COM-Xxx Device");
|
||||
|
||||
var control = CommFactory.GetControlPropertiesConfig(dc);
|
||||
if (control == null)
|
||||
{
|
||||
Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, control properties not found");
|
||||
return null;
|
||||
}
|
||||
|
||||
var ipid = control.IpIdInt;
|
||||
if (ipid < 2)
|
||||
{
|
||||
Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid IP-ID found");
|
||||
return null;
|
||||
}
|
||||
|
||||
switch (dc.Type)
|
||||
{
|
||||
case CenIoCom102Type:
|
||||
{
|
||||
return new CenIoComController(dc.Key, dc.Name, new CenIoCom102(ipid, Global.ControlSystem));
|
||||
}
|
||||
case CenIoCom202Type:
|
||||
{
|
||||
return new CenIoComController(dc.Key, dc.Name, new CenIoCom202(ipid, Global.ControlSystem));
|
||||
}
|
||||
default:
|
||||
{
|
||||
Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid type '{0}'", dc.Type);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using PepperDash.Core;
|
||||
using PepperDash.Core;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||
{
|
||||
@@ -11,14 +12,47 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||
void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
|
||||
|
||||
void LinkSystemMonitorToAppServer();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Describes a MobileSystemController that accepts IEssentialsRoom
|
||||
/// </summary>
|
||||
public interface IMobileControl3 : IMobileControl
|
||||
{
|
||||
void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Describes a MobileSystemController that accepts IEssentialsRoom
|
||||
/// </summary>
|
||||
public interface IMobileControl3 : IMobileControl
|
||||
{
|
||||
void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
|
||||
|
||||
void SendMessageObject(object o);
|
||||
|
||||
void AddAction(string key, object action);
|
||||
|
||||
void RemoveAction(string key);
|
||||
|
||||
void AddDeviceMessenger(IMobileControlMessenger messenger);
|
||||
|
||||
bool CheckForDeviceMessenger(string key);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Describes a mobile control messenger
|
||||
/// </summary>
|
||||
public interface IMobileControlMessenger : IKeyed
|
||||
{
|
||||
IMobileControl3 AppServerController { get; }
|
||||
string MessagePath { get; }
|
||||
void RegisterWithAppServer(IMobileControl3 appServerController);
|
||||
}
|
||||
|
||||
public interface IMobileControlResponseMessage
|
||||
{
|
||||
[JsonProperty("type")]
|
||||
string Type { get; }
|
||||
|
||||
[JsonProperty("clientId")]
|
||||
object ClientId { get; }
|
||||
|
||||
[JsonProperty("content")]
|
||||
object Content { get; }
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -185,7 +185,6 @@
|
||||
</Compile>
|
||||
<Compile Include="Crestron IO\Cards\CenCi33Controller.cs" />
|
||||
<Compile Include="Crestron IO\Cards\InternalCardCageController.cs" />
|
||||
<Compile Include="Crestron IO\CenIoCom\CenIoComController.cs" />
|
||||
<Compile Include="Crestron IO\DinCenCn\DinCenCnController.cs" />
|
||||
<Compile Include="Crestron IO\DinCenCn\IHasCresnetBranches.cs" />
|
||||
<Compile Include="Crestron IO\DinIo8\DinIo8Controller.cs" />
|
||||
|
||||
@@ -43,12 +43,11 @@ namespace PepperDash.Essentials.DM.AirMedia
|
||||
public BoolFeedback HdmiVideoSyncDetectedFeedback { get; private set; }
|
||||
public StringFeedback SerialNumberFeedback { get; private set; }
|
||||
public BoolFeedback AutomaticInputRoutingEnabledFeedback { get; private set; }
|
||||
public BoolFeedback HdmiInHdcpSupportOnFeedback { get; private set; }
|
||||
public BoolFeedback HdmiInDisabledByHdcpFeedback { get; private set; }
|
||||
|
||||
public AirMediaController(string key, string name, Am3x00 device, DeviceConfig dc, AirMediaPropertiesConfig props)
|
||||
: base(key, name, device)
|
||||
{
|
||||
|
||||
AirMedia = device;
|
||||
|
||||
DeviceConfig = dc;
|
||||
@@ -102,8 +101,6 @@ namespace PepperDash.Essentials.DM.AirMedia
|
||||
LoginCodeFeedback = new IntFeedback(() => AirMedia.AirMedia.LoginCodeFeedback.UShortValue);
|
||||
ConnectionAddressFeedback = new StringFeedback(() => AirMedia.AirMedia.ConnectionAddressFeedback.StringValue);
|
||||
HostnameFeedback = new StringFeedback(() => AirMedia.AirMedia.HostNameFeedback.StringValue);
|
||||
HdmiInHdcpSupportOnFeedback = new BoolFeedback(() => AirMedia.HdmiIn.HdcpSupportOnFeedback.BoolValue);
|
||||
HdmiInDisabledByHdcpFeedback = new BoolFeedback(() => AirMedia.HdmiIn.DisabledByHdcpFeedback.BoolValue);
|
||||
|
||||
// TODO: Figure out if we can actually get the TSID/Serial
|
||||
SerialNumberFeedback = new StringFeedback(() => "unknown");
|
||||
@@ -181,13 +178,6 @@ namespace PepperDash.Essentials.DM.AirMedia
|
||||
ConnectionAddressFeedback.LinkInputSig(trilist.StringInput[joinMap.ConnectionAddressFB.JoinNumber]);
|
||||
HostnameFeedback.LinkInputSig(trilist.StringInput[joinMap.HostnameFB.JoinNumber]);
|
||||
SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback.JoinNumber]);
|
||||
|
||||
trilist.SetSigFalseAction(joinMap.HdmiInHdcpSupportOn.JoinNumber, () => SetHcdpSupport(true));
|
||||
HdmiInHdcpSupportOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiInHdcpSupportOn.JoinNumber]);
|
||||
trilist.SetSigFalseAction(joinMap.HdmiInHdcpSupportOff.JoinNumber, () => SetHcdpSupport(false));
|
||||
HdmiInHdcpSupportOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.HdmiInHdcpSupportOff.JoinNumber]);
|
||||
|
||||
HdmiInDisabledByHdcpFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiInDisabledByHdcp.JoinNumber]);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -258,14 +248,6 @@ namespace PepperDash.Essentials.DM.AirMedia
|
||||
{
|
||||
if (args.EventId == DMInputEventIds.SourceSyncEventId)
|
||||
HdmiVideoSyncDetectedFeedback.FireUpdate();
|
||||
else if (args.EventId == DMInputEventIds.HdcpSupportOnEventId)
|
||||
{
|
||||
HdmiInHdcpSupportOnFeedback.FireUpdate();
|
||||
}
|
||||
else if (args.EventId == DMInputEventIds.DisabledByHdcpEventId)
|
||||
{
|
||||
HdmiInDisabledByHdcpFeedback.FireUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -314,14 +296,6 @@ namespace PepperDash.Essentials.DM.AirMedia
|
||||
AirMedia.DisplayControl.VideoOut = AmX00DisplayControl.eAirMediaX00VideoSource.AirBoard;
|
||||
}
|
||||
|
||||
public void SetHcdpSupport(bool on)
|
||||
{
|
||||
if (on)
|
||||
AirMedia.HdmiIn.HdcpSupportOn();
|
||||
else
|
||||
AirMedia.HdmiIn.HdcpSupportOff();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Reboots the device
|
||||
/// </summary>
|
||||
|
||||
@@ -88,7 +88,7 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
var audioDevice = new HdPsXxxOutputAudioController(Key, item.Number, _chassis);
|
||||
Debug.Console(2, this, "Adding HdPsXxxOutputAudioController '{0}' for output '{1}'", audioDevice.Key, item.Number);
|
||||
DeviceManager.AddDevice(audioDevice);
|
||||
}
|
||||
}
|
||||
foreach (var item in _chassis.AnalogAuxiliaryMixer)
|
||||
{
|
||||
var audioDevice = new HdPsXxxAnalogAuxMixerController(Key, item.MixerNumber, _chassis);
|
||||
@@ -111,7 +111,7 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
Debug.Console(1, this, "Failed to setup inputs, properties are null");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// iterate through HDMI inputs
|
||||
foreach (var item in _chassis.HdmiInputs)
|
||||
{
|
||||
@@ -124,7 +124,7 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
|
||||
input.Name.StringValue = name;
|
||||
|
||||
InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => InputNames[index]));
|
||||
|
||||
var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
|
||||
@@ -134,11 +134,11 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
Debug.Console(1, this, "Adding Input port: {0} - {1}", port.Key, name);
|
||||
InputPorts.Add(port);
|
||||
|
||||
InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => input.InputPort.HdcpSupportOnFeedback.BoolValue));
|
||||
|
||||
VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => input.InputPort.SyncDetectedFeedback.BoolValue));
|
||||
VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => input.VideoDetectedFeedback.BoolValue));
|
||||
}
|
||||
|
||||
// iterate through DM Lite inputs
|
||||
@@ -147,13 +147,13 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
var input = item;
|
||||
var index = item.Number;
|
||||
var key = string.Format("dmLiteIn{0}", index);
|
||||
var name = string.IsNullOrEmpty(InputNames[index])
|
||||
? string.Format("DM Input {0}", index)
|
||||
var name = string.IsNullOrEmpty(InputNames[index])
|
||||
? string.Format("DM Input {0}", index)
|
||||
: InputNames[index];
|
||||
|
||||
input.Name.StringValue = name;
|
||||
|
||||
InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => InputNames[index]));
|
||||
|
||||
var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
|
||||
@@ -163,11 +163,11 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
Debug.Console(0, this, "Adding Input port: {0} - {1}", port.Key, name);
|
||||
InputPorts.Add(port);
|
||||
|
||||
InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => input.InputPort.HdcpSupportOnFeedback.BoolValue));
|
||||
|
||||
VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => input.InputPort.SyncDetectedFeedback.BoolValue));
|
||||
VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => input.VideoDetectedFeedback.BoolValue));
|
||||
}
|
||||
|
||||
_chassis.DMInputChange += _chassis_InputChange;
|
||||
@@ -186,10 +186,10 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
{
|
||||
var output = item;
|
||||
var index = item.Number;
|
||||
var name = string.IsNullOrEmpty(OutputNames[index])
|
||||
? string.Format("Port {0}", index)
|
||||
var name = string.IsNullOrEmpty(OutputNames[index])
|
||||
? string.Format("Port {0}", index)
|
||||
: OutputNames[index];
|
||||
|
||||
|
||||
output.Name.StringValue = name;
|
||||
|
||||
var hdmiKey = string.Format("hdmiOut{0}", index);
|
||||
@@ -209,11 +209,11 @@ namespace PepperDash_Essentials_DM.Chassis
|
||||
};
|
||||
Debug.Console(1, this, "Adding Port port: {0} - {1}", dmLitePort.Key, name);
|
||||
OutputPorts.Add(dmLitePort);
|
||||
|
||||
OutputRouteNameFeedback.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => output.VideoOutFeedback.NameFeedback.StringValue));
|
||||
|
||||
OutputRouteNameFeedback.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => output.VideoOutFeedback.NameFeedback.StringValue));
|
||||
|
||||
VideoOutputRouteFeedbacks.Add(new IntFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
VideoOutputRouteFeedbacks.Add(new IntFeedback(index.ToString(CultureInfo.InvariantCulture),
|
||||
() => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number));
|
||||
}
|
||||
/*
|
||||
@@ -352,8 +352,8 @@ Selector: {4}
|
||||
public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
|
||||
{
|
||||
var input = inputSelector as HdPsXxxInput;
|
||||
var output = outputSelector as HdPsXxxOutput;
|
||||
|
||||
var output = outputSelector as HdPsXxxOutput;
|
||||
|
||||
Debug.Console(2, this, "ExecuteSwitch: input={0}, output={1}", input, output);
|
||||
|
||||
if (output == null)
|
||||
@@ -456,37 +456,24 @@ Selector: {4}
|
||||
// _chassis input change event
|
||||
private void _chassis_InputChange(Switch device, DMInputEventArgs args)
|
||||
{
|
||||
switch (args.EventId)
|
||||
var eventId = args.EventId;
|
||||
|
||||
switch (eventId)
|
||||
{
|
||||
case DMInputEventIds.RemoteTransmitterDetectedEventId:
|
||||
{
|
||||
// signal found on HD-PSXxx > Inputs > Inputs DM Lite X
|
||||
Debug.Console(2, this, "{0} DM Input Event ID {1}-RemoteTransmitterDetected | Number {2}",
|
||||
device.ToString(), args.EventId, args.Number);
|
||||
break;
|
||||
}
|
||||
case DMInputEventIds.SourceSyncEventId: // id-14
|
||||
case DMInputEventIds.VideoDetectedEventId: // id-9
|
||||
case DMInputEventIds.VideoDetectedEventId:
|
||||
{
|
||||
// signal found on HD-PSXxx > Inputs > HDMI/DM Lite X
|
||||
Debug.Console(1, this, "{0} DM Input Event ID {1} | Number {2}: Updating VideoInputSyncFeedbacks",
|
||||
device.Name, args.EventId, args.Number);
|
||||
|
||||
var input = args.Number;
|
||||
|
||||
var feedback = VideoInputSyncFeedbacks[(int)input];
|
||||
if (feedback == null) return;
|
||||
|
||||
feedback.FireUpdate();
|
||||
|
||||
Debug.Console(1, this, "Event ID {0}: Updating VideoInputSyncFeedbacks", eventId);
|
||||
foreach (var item in VideoInputSyncFeedbacks)
|
||||
{
|
||||
item.FireUpdate();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DMInputEventIds.InputNameFeedbackEventId:
|
||||
case DMInputEventIds.InputNameEventId:
|
||||
case DMInputEventIds.NameFeedbackEventId:
|
||||
{
|
||||
Debug.Console(1, this, "{0} DM Input Event ID {1}-Name | Number {2}: Updating name feedbacks",
|
||||
device.Name, args.EventId, args.Number);
|
||||
Debug.Console(1, this, "Event ID {0}: Updating name feedbacks", eventId);
|
||||
|
||||
var input = args.Number;
|
||||
var name = _chassis.HdmiInputs[input].NameFeedback.StringValue;
|
||||
@@ -496,8 +483,7 @@ Selector: {4}
|
||||
}
|
||||
default:
|
||||
{
|
||||
Debug.Console(1, this, "{0} DM Input Event ID {1} | Number {2}: Uhandled",
|
||||
device.Name, args.EventId, args.Number);
|
||||
Debug.Console(1, this, "Uhandled DM Input Event ID {0}", eventId);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -505,53 +491,33 @@ Selector: {4}
|
||||
OnDmInputChange(args);
|
||||
}
|
||||
|
||||
|
||||
// _chassis output change event
|
||||
private void _chassis_OutputChange(Switch device, DMOutputEventArgs args)
|
||||
{
|
||||
switch (args.EventId)
|
||||
{
|
||||
case DMOutputEventIds.VideoOutEventId:
|
||||
{
|
||||
Debug.Console(2, this, "{0} DM Output Event Id {1} | Number {2} | Index {3}: VideoOutEventId",
|
||||
device.Name, args.EventId, args.Number, args.Index);
|
||||
if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
|
||||
|
||||
var output = args.Number;
|
||||
var output = args.Number;
|
||||
|
||||
var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
|
||||
? 0
|
||||
: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
|
||||
var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
|
||||
? 0
|
||||
: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
|
||||
|
||||
var outputName = OutputNames[output];
|
||||
var outputName = OutputNames[output];
|
||||
|
||||
var feedback = VideoOutputRouteFeedbacks[outputName];
|
||||
if (feedback == null) return;
|
||||
var feedback = VideoOutputRouteFeedbacks[outputName];
|
||||
if (feedback == null) return;
|
||||
|
||||
var inputPort = InputPorts.FirstOrDefault(
|
||||
p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
|
||||
var inputPort = InputPorts.FirstOrDefault(
|
||||
p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
|
||||
|
||||
var outputPort = OutputPorts.FirstOrDefault(
|
||||
p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
|
||||
var outputPort = OutputPorts.FirstOrDefault(
|
||||
p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
|
||||
|
||||
feedback.FireUpdate();
|
||||
feedback.FireUpdate();
|
||||
|
||||
OnSwitchChange(new RoutingNumericEventArgs(output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
|
||||
|
||||
break;
|
||||
}
|
||||
case DMOutputEventIds.RemoteReceiverDetectedEventId:
|
||||
{
|
||||
// signal found on HD-PSXxx > Output[s] > Output [X] > DM Lite [X]
|
||||
Debug.Console(2, this, "{0} DM Output Event Id {1} | Number {2} | Index {3}: RemoteRecevierDetectedEventId",
|
||||
device.Name, args.EventId, args.Number, args.Index);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
Debug.Console(2, this, "{0} DM Output Event Id {1} | Number {2} | Index:{3}: Unhandled",
|
||||
device.Name, args.EventId, args.Number, args.Index);
|
||||
break;
|
||||
}
|
||||
}
|
||||
OnSwitchChange(new RoutingNumericEventArgs(
|
||||
output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
|
||||
}
|
||||
|
||||
|
||||
@@ -577,9 +543,9 @@ Selector: {4}
|
||||
#region Factory
|
||||
|
||||
|
||||
public class HdPsXxxControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
|
||||
public class HdSp401ControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
|
||||
{
|
||||
public HdPsXxxControllerFactory()
|
||||
public HdSp401ControllerFactory()
|
||||
{
|
||||
TypeNames = new List<string> { "hdps401", "hdps402", "hdps621", "hdps622" };
|
||||
}
|
||||
|
||||
@@ -994,7 +994,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
|
||||
|
||||
//Special Change for protected directory clear
|
||||
|
||||
trilist.SetBoolSigAction(joinMap.DirectoryClearSelected.JoinNumber, (b) => SelectDirectoryEntry(codec, 0, trilist, joinMap));
|
||||
trilist.SetBoolSigAction(joinMap.DirectoryClearSelected.JoinNumber, (b) => SelectDirectoryEntry(_directoryCodec, 0, _directoryTrilist, _directoryJoinmap));
|
||||
|
||||
// Report feedback for number of contact methods for selected contact
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<packages>
|
||||
<package id="PepperDashCore" version="1.3.3-hotfix-390" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
|
||||
<package id="PepperDashCore" version="1.3.1" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
|
||||
</packages>
|
||||
|
||||
Reference in New Issue
Block a user