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

Tested working onsite with Trevor Payne

Browse Source
This commit is contained in:
Neil Dorin
2019-09-04 14:28:50 -06:00
parent 4dafa34b2e
commit 0b9ed462b4
6 changed files with 216 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs
View File

@@ -69,7 +69,7 @@ namespace PepperDash.Essentials.DM
return PepperDash.Essentials.DM.Chassis.HdMdNxM4kEController.GetController(key, name, type, props);
}
else if (typeName.Equals("hdmd400ce") || typeName.Equals("hdmd300ce") || typeName.Equals("hdmd200ce"))
else if (typeName.Equals("hdmd400ce") || typeName.Equals("hdmd300ce") || typeName.Equals("hdmd200ce") || typeName.Equals("hdmd200c1ge"))
{
var props = JsonConvert.DeserializeObject
<PepperDash.Essentials.DM.HdMdxxxCEPropertiesConfig>(properties.ToString());

47
essentials-framework/Essentials DM/Essentials_DM/DmLite/HdMdxxxCEController.cs
View File

@@ -16,13 +16,13 @@ namespace PepperDash.Essentials.DM
/// <summary>
/// Represent both a transmitter and receiver pair of the HD-MD-400-C-E / HD-MD-300-C-E / HD-MD-200-C-E kits
/// </summary>
public class HdMdxxxCEController : CrestronGenericBaseDevice, IRouting //, IComPorts
public class HdMdxxxCEController : CrestronGenericBaseDevice, IRouting//, IComPorts
{
/// <summary>
/// DmLite Ports
/// </summary>
public RoutingOutputPort ToRx { get; private set; }
public RoutingInputPort FromTx { get; private set; }
///// DmLite Ports
///// </summary>
//public RoutingOutputPort ToRx { get; private set; }
//public RoutingInputPort FromTx { get; private set; }
public RoutingOutputPort HdmiOut { get; private set; }
@@ -30,16 +30,34 @@ namespace PepperDash.Essentials.DM
public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
/// <summary>
/// The value of the current video source for the HDMI output on the receiver
/// </summary>
public IntFeedback VideoSourceFeedback { get; private set; }
/// <summary>
/// Indicates if Auto Route is on on the transmitter
/// </summary>
public BoolFeedback AutoRouteOnFeedback { get; private set; }
/// <summary>
/// Indicates if Priority Routing is on on the transmitter
/// </summary>
public BoolFeedback PriorityRoutingOnFeedback { get; private set; }
/// <summary>
/// INdicates if the On Screen Display is enabled
/// </summary>
public BoolFeedback InputOnScreenDisplayEnabledFeedback { get; private set; }
/// <summary>
/// Indicates if video sync is detected on each of the inputs
/// </summary>
public Dictionary<uint, BoolFeedback> SyncDetectedFeedbacks { get; private set; }
/// <summary>
/// Indicates if the remote end device is detected
/// </summary>
public BoolFeedback RemoteEndDetectedFeedback { get; private set; }
public RoutingPortCollection<RoutingOutputPort> OutputPorts
@@ -63,6 +81,8 @@ namespace PepperDash.Essentials.DM
InputPorts = new RoutingPortCollection<RoutingInputPort>();
SyncDetectedFeedbacks = new Dictionary<uint, BoolFeedback>();
// Add the HDMI input port on the receiver
InputPorts.Add(new RoutingInputPort(DmPortName.Hdmi, eRoutingSignalType.Audio | eRoutingSignalType.Video,
eRoutingPortConnectionType.Hdmi, 1, this));
@@ -110,16 +130,17 @@ namespace PepperDash.Essentials.DM
InputPorts[DmPortName.HdmiIn].Port = TxRxPair.HdmiInputs[1];
}
//ToRx = new RoutingOutputPort(DmPortName.ToTx, eRoutingSignalType.Audio | eRoutingSignalType.Video,
// eRoutingPortConnectionType.DmCat, null, this);
ToRx = new RoutingOutputPort(DmPortName.ToTx, eRoutingSignalType.Audio | eRoutingSignalType.Video,
eRoutingPortConnectionType.DmCat, null, this);
FromTx = new RoutingInputPort(DmPortName.FromTx, eRoutingSignalType.Audio | eRoutingSignalType.Video,
eRoutingPortConnectionType.DmCat, null, this);
//FromTx = new RoutingInputPort(DmPortName.FromTx, eRoutingSignalType.Audio | eRoutingSignalType.Video,
// eRoutingPortConnectionType.DmCat, null, this);
HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
eRoutingPortConnectionType.Hdmi, null, this);
OutputPorts[DmPortName.HdmiOut].Port = TxRxPair.HdmiOutputs[1];
TxRxPair.DMInputChange += new DMInputEventHandler(TxRxPair_DMInputChange);
TxRxPair.DMOutputChange += new DMOutputEventHandler(TxRxPair_DMOutputChange);
TxRxPair.DMSystemChange += new DMSystemEventHandler(TxRxPair_DMSystemChange);
@@ -183,7 +204,11 @@ namespace PepperDash.Essentials.DM
public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
{
TxRxPair.HdmiOutputs[1].VideoOut = TxRxPair.Inputs[(uint)inputSelector];
var number = Convert.ToUInt32(inputSelector); // Cast can sometimes fail
var input = number == 0 ? null : TxRxPair.Inputs[number];
TxRxPair.HdmiOutputs[1].VideoOut = input;
}
// This device has a different class for com ports which will make it hard to implement IComPorts....

2
essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj
View File

@@ -113,7 +113,7 @@
<Compile Include="Endpoints\NVX\DmNvxControllerBase.cs" />
<Compile Include="Endpoints\DGEs\DgeController.cs" />
<Compile Include="Endpoints\DGEs\DgePropertiesConfig.cs" />
<Compile Include="DmLite\DmMdxxxCEController.cs" />
<Compile Include="DmLite\HdMdxxxCEController.cs" />
<Compile Include="Endpoints\Receivers\DmHdBaseTEndpointController.cs" />
<Compile Include="Endpoints\Receivers\DmRmc100SController.cs" />
<Compile Include="Endpoints\Receivers\DmRmc150SController.cs" />