Merge pull request #1164 from PepperDash/feature/hdps-dm-event-updates

Feature/hdps dm event updates
This commit is contained in:
Andrew Welker
2024-02-02 08:53:29 -06:00
committed by GitHub

View File

@@ -138,7 +138,7 @@ namespace PepperDash_Essentials_DM.Chassis
() => input.InputPort.HdcpSupportOnFeedback.BoolValue)); () => input.InputPort.HdcpSupportOnFeedback.BoolValue));
VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture), VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
() => input.VideoDetectedFeedback.BoolValue)); () => input.InputPort.SyncDetectedFeedback.BoolValue));
} }
// iterate through DM Lite inputs // iterate through DM Lite inputs
@@ -167,7 +167,7 @@ namespace PepperDash_Essentials_DM.Chassis
() => input.InputPort.HdcpSupportOnFeedback.BoolValue)); () => input.InputPort.HdcpSupportOnFeedback.BoolValue));
VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture), VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
() => input.VideoDetectedFeedback.BoolValue)); () => input.InputPort.SyncDetectedFeedback.BoolValue));
} }
_chassis.DMInputChange += _chassis_InputChange; _chassis.DMInputChange += _chassis_InputChange;
@@ -456,24 +456,37 @@ Selector: {4}
// _chassis input change event // _chassis input change event
private void _chassis_InputChange(Switch device, DMInputEventArgs args) private void _chassis_InputChange(Switch device, DMInputEventArgs args)
{ {
var eventId = args.EventId; switch (args.EventId)
switch (eventId)
{ {
case DMInputEventIds.VideoDetectedEventId: case DMInputEventIds.RemoteTransmitterDetectedEventId:
{ {
Debug.Console(1, this, "Event ID {0}: Updating VideoInputSyncFeedbacks", eventId); // signal found on HD-PSXxx > Inputs > Inputs DM Lite X
foreach (var item in VideoInputSyncFeedbacks) Debug.Console(2, this, "{0} DM Input Event ID {1}-RemoteTransmitterDetected | Number {2}",
{ device.ToString(), args.EventId, args.Number);
item.FireUpdate(); break;
} }
case DMInputEventIds.SourceSyncEventId: // id-14
case DMInputEventIds.VideoDetectedEventId: // id-9
{
// 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();
break; break;
} }
case DMInputEventIds.InputNameFeedbackEventId: case DMInputEventIds.InputNameFeedbackEventId:
case DMInputEventIds.InputNameEventId: case DMInputEventIds.InputNameEventId:
case DMInputEventIds.NameFeedbackEventId: case DMInputEventIds.NameFeedbackEventId:
{ {
Debug.Console(1, this, "Event ID {0}: Updating name feedbacks", eventId); Debug.Console(1, this, "{0} DM Input Event ID {1}-Name | Number {2}: Updating name feedbacks",
device.Name, args.EventId, args.Number);
var input = args.Number; var input = args.Number;
var name = _chassis.HdmiInputs[input].NameFeedback.StringValue; var name = _chassis.HdmiInputs[input].NameFeedback.StringValue;
@@ -483,7 +496,8 @@ Selector: {4}
} }
default: default:
{ {
Debug.Console(1, this, "Uhandled DM Input Event ID {0}", eventId); Debug.Console(1, this, "{0} DM Input Event ID {1} | Number {2}: Uhandled",
device.Name, args.EventId, args.Number);
break; break;
} }
} }
@@ -491,33 +505,53 @@ Selector: {4}
OnDmInputChange(args); OnDmInputChange(args);
} }
// _chassis output change event // _chassis output change event
private void _chassis_OutputChange(Switch device, DMOutputEventArgs args) private void _chassis_OutputChange(Switch device, DMOutputEventArgs args)
{ {
if (args.EventId != DMOutputEventIds.VideoOutEventId) return; 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);
var output = args.Number; var output = args.Number;
var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
? 0 ? 0
: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number; : _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
var outputName = OutputNames[output]; var outputName = OutputNames[output];
var feedback = VideoOutputRouteFeedbacks[outputName]; var feedback = VideoOutputRouteFeedbacks[outputName];
if (feedback == null) return; if (feedback == null) return;
var inputPort = InputPorts.FirstOrDefault( var inputPort = InputPorts.FirstOrDefault(
p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback); p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
var outputPort = OutputPorts.FirstOrDefault( var outputPort = OutputPorts.FirstOrDefault(
p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]); p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
feedback.FireUpdate(); feedback.FireUpdate();
OnSwitchChange(new RoutingNumericEventArgs( OnSwitchChange(new RoutingNumericEventArgs(output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
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;
}
}
} }
@@ -543,9 +577,9 @@ Selector: {4}
#region Factory #region Factory
public class HdSp401ControllerFactory : EssentialsDeviceFactory<HdPsXxxController> public class HdPsXxxControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
{ {
public HdSp401ControllerFactory() public HdPsXxxControllerFactory()
{ {
TypeNames = new List<string> { "hdps401", "hdps402", "hdps621", "hdps622" }; TypeNames = new List<string> { "hdps401", "hdps402", "hdps621", "hdps622" };
} }