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

Merge pull request #843 from PepperDash/feature/dm-endpoint-registration-testing

Browse Source 
fix(essentials): #842 Adds back in code to register Crestron devices …
This commit is contained in:
Neil Dorin
2021-09-29 16:21:03 -06:00
committed by GitHub
parent 61be312826 805022631b
commit 493b391d6f
4 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PepperDashEssentials/ControlSystem.cs
View File

@@ -53,11 +53,14 @@ namespace PepperDash.Essentials
// to allow any HD-BaseT DM endpoints to register first. // to allow any HD-BaseT DM endpoints to register first.
if (Global.ControlSystemIsDmpsType) if (Global.ControlSystemIsDmpsType)
{ {
Debug.Console(2, "******************* InitializeSystem() Entering **********************");
_initializeEvent = new CEvent(); _initializeEvent = new CEvent();
DeviceManager.AllDevicesActivated += (o, a) => DeviceManager.AllDevicesActivated += (o, a) =>
{ {
_initializeEvent.Set(); _initializeEvent.Set();
Debug.Console(2, "******************* InitializeSystem() Exiting **********************");
}; };
_initializeEvent.Wait(30000); _initializeEvent.Wait(30000);

27
essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs
View File

@@ -69,19 +69,28 @@ namespace PepperDash.Essentials.Core
public override bool CustomActivate() public override bool CustomActivate()
{ {
Debug.Console(0, this, "Activating"); Debug.Console(0, this, "Activating");
if (!PreventRegistration) if (!PreventRegistration)
{ {
//Debug.Console(1, this, " Does not require registration. Skipping"); //Debug.Console(1, this, " Does not require registration. Skipping");
var response = Hardware.RegisterWithLogging(Key); var response = Hardware.RegisterWithLogging(Key);
if (response != eDeviceRegistrationUnRegistrationResponse.Success) if (response != eDeviceRegistrationUnRegistrationResponse.Success)
{ {
//Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response); //Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
return false; return false;
} }
IsRegistered.FireUpdate(); IsRegistered.FireUpdate();
} }
else
{
AddPostActivationAction(() =>
{
var response = Hardware.RegisterWithLogging(Key);
IsRegistered.FireUpdate();
});
}
foreach (var f in Feedbacks) foreach (var f in Feedbacks)
{ {

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

@@ -43,6 +43,17 @@ namespace PepperDash.Essentials.Core
} }
} }
/// <summary>
/// True when the processor type is a DMPS 4K variant
/// </summary>
public static bool ControlSystemIsDmps4kType
{
get
{
return ControlSystemIsDmpsType && ControlSystem.ControllerPrompt.ToLower().IndexOf("4k") > -1;
}
}
/// <summary> /// <summary>
/// The file path prefix to the folder containing configuration files /// The file path prefix to the folder containing configuration files
/// </summary> /// </summary>

20
essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
View File

@@ -36,7 +36,7 @@ namespace PepperDash.Essentials.DM
var ipid = props.Control.IpIdInt; var ipid = props.Control.IpIdInt;
var pKey = props.ParentDeviceKey.ToLower(); var pKey = props.ParentDeviceKey.ToLower();
if (pKey == "processor") if (pKey == "processor")
{ {
// Catch constructor failures, mainly dues to IPID // Catch constructor failures, mainly dues to IPID
try try
@@ -70,7 +70,7 @@ namespace PepperDash.Essentials.DM
var parentDev = DeviceManager.GetDeviceForKey(pKey); var parentDev = DeviceManager.GetDeviceForKey(pKey);
DMInput dmInput; DMInput dmInput;
bool noIpId = false; bool isCpu3 = false;
if (parentDev is IDmSwitch) if (parentDev is IDmSwitch)
{ {
@@ -96,7 +96,7 @@ namespace PepperDash.Essentials.DM
chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps || chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps ||
chassis is DmMd128x128 || chassis is DmMd64x64) chassis is DmMd128x128 || chassis is DmMd64x64)
{ {
noIpId = true; isCpu3 = true;
} }
} }
@@ -116,7 +116,6 @@ namespace PepperDash.Essentials.DM
} }
dmpsDev.TxDictionary.Add(num, key); dmpsDev.TxDictionary.Add(num, key);
noIpId = dmpsDev.Dmps4kType;
try try
{ {
@@ -138,7 +137,7 @@ namespace PepperDash.Essentials.DM
try try
{ {
// Must use different constructor for CPU3 or DMPS3-4K types. No IPID // Must use different constructor for CPU3 or DMPS3-4K types. No IPID
if (noIpId) if (isCpu3 || Global.ControlSystemIsDmps4kType)
{ {
if (typeName.StartsWith("dmtx200")) if (typeName.StartsWith("dmtx200"))
return new DmTx200Controller(key, name, new DmTx200C2G(dmInput)); return new DmTx200Controller(key, name, new DmTx200C2G(dmInput));
@@ -222,11 +221,12 @@ namespace PepperDash.Essentials.DM
protected DmTxControllerBase(string key, string name, EndpointTransmitterBase hardware) protected DmTxControllerBase(string key, string name, EndpointTransmitterBase hardware)
: base(key, name, hardware) : base(key, name, hardware)
{ {
// if wired to a chassis, skip registration step in base class // if wired to a chassis or DMPS, skip registration step in base class
if (hardware.DMInput != null) if (hardware.DMInput != null || (Global.ControlSystemIsDmpsType && hardware.DMInput != null))
{ {
this.PreventRegistration = true; this.PreventRegistration = true;
} }
AddToFeedbackList(ActiveVideoInputFeedback); AddToFeedbackList(ActiveVideoInputFeedback);
} }