pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-14 12:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1135 from PepperDash/feature/hdpsXxx-fixes

Browse Source 
Feature/hdps xxx fixes
This commit is contained in:
Andrew Welker
2023-09-20 16:07:11 -05:00
committed by GitHub
parent 95c37872ad 1569c12450
commit 1e07e44279
4 changed files with 107 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs
View File

@@ -115,41 +115,54 @@ namespace PepperDash.Essentials.Core
/// <returns></returns> /// <returns></returns>
public static ICec GetCecPort(ControlPropertiesConfig config) public static ICec GetCecPort(ControlPropertiesConfig config)
{ {
var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey); try
{
var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
if (dev != null) Debug.Console(0, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
{ ? "is not valid, failed to get cec port"
if (!String.IsNullOrEmpty(config.ControlPortName)) : "found in device manager, attempting to get cec port");
{
var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName]; if (dev == null)
return null;
if (inputPort != null) if (String.IsNullOrEmpty(config.ControlPortName))
{ {
if (inputPort.Port is ICec) Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
return inputPort.Port as ICec; return null;
} }
var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
if (outputPort != null) var inputsOutputs = dev as IRoutingInputsOutputs;
{ if (inputsOutputs == null)
if (outputPort.Port is ICec) {
return outputPort.Port as ICec; Debug.Console(0, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
} config.ControlPortDevKey, config.ControlPortName);
else return null;
Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called: '{1}'", }
config.ControlPortDevKey, config.ControlPortName);
}
else
{
Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
}
}
Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
return null; var inputPort = inputsOutputs.InputPorts[config.ControlPortName];
if (inputPort != null && inputPort.Port is ICec)
return inputPort.Port as ICec;
var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
if (outputPort != null && outputPort.Port is ICec)
return outputPort.Port as ICec;
}
catch (Exception ex)
{
Debug.Console(1, "GetCecPort Exception Message: {0}", ex.Message);
Debug.Console(2, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
if (ex.InnerException != null)
Debug.Console(0, "GetCecPort Exception InnerException: {0}", ex.InnerException);
}
Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
config.ControlPortDevKey, config.ControlPortName);
return null;
} }
/// <summary> /// <summary>

5
essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs
View File

@@ -204,4 +204,9 @@ namespace PepperDash.Essentials.Core
SigType = sigType; SigType = sigType;
} }
} }
public interface IRoutingHasVideoInputSyncFeedbacks
{
FeedbackCollection<BoolFeedback> VideoInputSyncFeedbacks { get; }
}
} }

11
essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs
View File

@@ -155,7 +155,7 @@ namespace PepperDash.Essentials.Core.Touchpanels
return; return;
} }
Feedback deviceFeedback = null; Feedback deviceFeedback;
try try
{ {
@@ -166,9 +166,16 @@ namespace PepperDash.Essentials.Core.Touchpanels
key, buttonFeedback.DeviceKey); key, buttonFeedback.DeviceKey);
return; return;
} }
deviceFeedback = device.GetFeedbackProperty(buttonFeedback.FeedbackName);
if (deviceFeedback == null)
{
Debug.Console(1, this, "Button '{0}' feedback failed to get feedback property for '{1}', feedback will not be implemented. Verify feedback deviceKey is properly configured.",
key, buttonFeedback.FeedbackName);
return;
}
// TODO [ ] verify if this can replace the current method // TODO [ ] verify if this can replace the current method
deviceFeedback = device.GetFeedbackProperty(buttonFeedback.FeedbackName);
//Debug.Console(0, this, "deviceFeedback.GetType().Name: '{0}'", deviceFeedback.GetType().Name); //Debug.Console(0, this, "deviceFeedback.GetType().Name: '{0}'", deviceFeedback.GetType().Name);
//switch (feedback.GetType().Name.ToLower()) //switch (feedback.GetType().Name.ToLower())
//{ //{

112
essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxController.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using Crestron.SimplSharpPro; using Crestron.SimplSharpPro;
using Crestron.SimplSharpPro.DeviceSupport; using Crestron.SimplSharpPro.DeviceSupport;
@@ -15,10 +16,9 @@ using PepperDash_Essentials_DM.Config;
namespace PepperDash_Essentials_DM.Chassis namespace PepperDash_Essentials_DM.Chassis
{ {
[Description("Wrapper class for all HdPsXxx switchers")] [Description("Wrapper class for all HdPsXxx switchers")]
public class HdPsXxxController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback public class HdPsXxxController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, IRoutingHasVideoInputSyncFeedbacks
{ {
private readonly HdPsXxx _chassis; private readonly HdPsXxx _chassis;
//private byte[] _inputPriorityParams;
public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; } public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; } public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
@@ -41,6 +41,7 @@ namespace PepperDash_Essentials_DM.Chassis
public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange; public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
public event EventHandler<DMInputEventArgs> DmInputChange; public event EventHandler<DMInputEventArgs> DmInputChange;
/// <summary> /// <summary>
/// Constructor /// Constructor
/// </summary> /// </summary>
@@ -76,12 +77,6 @@ namespace PepperDash_Essentials_DM.Chassis
if (_chassis.NumberOfOutputs == 1) if (_chassis.NumberOfOutputs == 1)
AutoRouteFeedback = new BoolFeedback(() => _chassis.PriorityRouteOnFeedback.BoolValue); AutoRouteFeedback = new BoolFeedback(() => _chassis.PriorityRouteOnFeedback.BoolValue);
//if (props.InputPriorities != null)
//{
// _inputPriorityParams = new byte[_chassis.NumberOfInputs];
// _inputPriorityParams = GetInputPriorities(props);
//}
InputNames = props.Inputs; InputNames = props.Inputs;
SetupInputs(InputNames); SetupInputs(InputNames);
@@ -90,7 +85,7 @@ namespace PepperDash_Essentials_DM.Chassis
} }
// get input priorities // get input priorities
private byte[] GetInputPriorities(HdPsXxxPropertiesConfig props) private byte[] SetInputPriorities(HdPsXxxPropertiesConfig props)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
@@ -103,52 +98,63 @@ namespace PepperDash_Essentials_DM.Chassis
Debug.Console(1, this, "Failed to setup inputs, properties are null"); Debug.Console(1, this, "Failed to setup inputs, properties are null");
return; return;
} }
foreach (var kvp in dict)
{ // iterate through HDMI inputs
Debug.Console(1, this, "props.Input[{0}]: {1}", kvp.Key, kvp.Value);
}
foreach (var item in _chassis.HdmiInputs) foreach (var item in _chassis.HdmiInputs)
{ {
var input = item; var input = item;
var index = item.Number; var index = item.Number;
var key = string.Format("hdmiIn{0}", index); var key = string.Format("hdmiIn{0}", index);
var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("HDMI Input {0}", index) : InputNames[index]; var name = string.IsNullOrEmpty(InputNames[index])
? string.Format("HDMI Input {0}", index)
: InputNames[index];
InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index])); input.Name.StringValue = name;
InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
() => InputNames[index]));
var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this) var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
{ {
FeedbackMatchObject = input FeedbackMatchObject = input
}; };
Debug.Console(1, this, "Adding Input port: {0}", port.Key); Debug.Console(1, this, "Adding Input port: {0} - {1}", port.Key, name);
InputPorts.Add(port); InputPorts.Add(port);
InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue)); InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
() => input.InputPort.HdcpSupportOnFeedback.BoolValue));
VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue)); VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
() => input.VideoDetectedFeedback.BoolValue));
} }
// iterate through DM Lite inputs
foreach (var item in _chassis.DmLiteInputs) foreach (var item in _chassis.DmLiteInputs)
{ {
var input = item; var input = item;
var index = item.Number; var index = item.Number;
var key = string.Format("dmLiteIn{0}", index); var key = string.Format("dmLiteIn{0}", index);
var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("DM Input {0}", index) : InputNames[index]; var name = string.IsNullOrEmpty(InputNames[index])
? string.Format("DM Input {0}", index)
: InputNames[index];
input.Name.StringValue = name; input.Name.StringValue = name;
InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index])); InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
() => InputNames[index]));
var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this) var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
{ {
FeedbackMatchObject = input FeedbackMatchObject = input
}; };
Debug.Console(0, this, "Adding Input port: {0}", port.Key); Debug.Console(0, this, "Adding Input port: {0} - {1}", port.Key, name);
InputPorts.Add(port); InputPorts.Add(port);
InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue)); InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
() => input.InputPort.HdcpSupportOnFeedback.BoolValue));
VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue)); VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
() => input.VideoDetectedFeedback.BoolValue));
} }
_chassis.DMInputChange += _chassis_InputChange; _chassis.DMInputChange += _chassis_InputChange;
@@ -162,54 +168,40 @@ namespace PepperDash_Essentials_DM.Chassis
Debug.Console(1, this, "Failed to setup outputs, properties are null"); Debug.Console(1, this, "Failed to setup outputs, properties are null");
return; return;
} }
foreach (var kvp in dict)
{
Debug.Console(1, this, "props.Output[{0}]: {1}", kvp.Key, kvp.Value);
}
foreach (var item in _chassis.HdmiDmLiteOutputs) foreach (var item in _chassis.HdmiDmLiteOutputs)
{ {
var output = item; var output = item;
var index = item.Number; var index = item.Number;
var key = string.Format("hdmiDmLiteOut{0}", index); var name = string.IsNullOrEmpty(OutputNames[index])
var name = string.IsNullOrEmpty(OutputNames[index]) ? string.Format("Output {0}", index) : OutputNames[index]; ? string.Format("Output {0}", index)
: OutputNames[index];
output.Name.StringValue = name; output.Name.StringValue = name;
var port = new RoutingOutputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, output, this) var hdmiKey = string.Format("hdmiOut{0}", index);
var hdmiPort = new RoutingOutputPort(hdmiKey, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, output, this)
{ {
FeedbackMatchObject = output, FeedbackMatchObject = output,
// set port for CEC Port = output.HdmiOutput.HdmiOutputPort
Port = output
}; };
Debug.Console(0, this, "Adding Output port: {0}", port.Key); Debug.Console(1, this, "Adding Output port: {0} - {1}", hdmiPort.Key, name);
OutputPorts.Add(port); OutputPorts.Add(hdmiPort);
OutputRouteNameFeedback.Add(new StringFeedback(name, () => output.VideoOutFeedback.NameFeedback.StringValue)); var dmLiteKey = string.Format("dmLiteOut{0}", index);
var dmLitePort = new RoutingOutputPort(dmLiteKey, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.DmCat, output, this)
{
FeedbackMatchObject = output,
Port = output.DmLiteOutput.DmLiteOutputPort
};
Debug.Console(1, this, "Adding Output port: {0} - {1}", dmLitePort.Key, name);
OutputPorts.Add(dmLitePort);
OutputRouteNameFeedback.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
() => output.VideoOutFeedback.NameFeedback.StringValue));
VideoOutputRouteFeedbacks.Add(new IntFeedback(name, VideoOutputRouteFeedbacks.Add(new IntFeedback(index.ToString(CultureInfo.InvariantCulture),
() => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number)); () => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number));
// TODO [ ] Investigate setting input priorities per output
// {{in1-priority-level}, {in2-priority-level}, .... {in6-priority-level}}
// default priority level input 1-4 ascending
//if (_inputPriorityParams != null && _inputPriorityParams.Count() > 0)
// output.OutputPort.InputPriorities(_inputPriorityParams);
if (port.Port == null) continue;
var hdmiOutputStreamCec = output.HdmiOutput.HdmiOutputPort.StreamCec;
if (hdmiOutputStreamCec != null)
{
var streamCec = new StreamCecWrapper(string.Format("{0}-hdmiOut{1}-streamCec", Key, index), hdmiOutputStreamCec);
DeviceManager.AddDevice(streamCec);
}
var dmLiteOutputStreamCec = output.DmLiteOutput.DmLiteOutputPort.StreamCec;
if (dmLiteOutputStreamCec != null)
{
var streamCec = new StreamCecWrapper(string.Format("{0}-dmLiteOut{1}-streamCec", Key, index), dmLiteOutputStreamCec);
DeviceManager.AddDevice(streamCec);
}
} }
_chassis.DMOutputChange += _chassis_OutputChange; _chassis.DMOutputChange += _chassis_OutputChange;
@@ -547,7 +539,7 @@ namespace PepperDash_Essentials_DM.Chassis
} }
#endregion #endregion
} }