mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-08-31 10:58:28 +00:00
Merge pull request #1448 from PepperDash/fix-cecportcontroller-null-streamcec-guard
Fix cecportcontroller null streamcec guard
This commit is contained in:
Andrew Knous
GitHub
commit
e23c987516
9 changed files with 266 additions and 20 deletions
|
|
@ -39,6 +39,8 @@ namespace PepperDash.Essentials.Core
|
|||
|
||||
ICec Port;
|
||||
|
||||
bool _cecSubscribed;
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
|
|
@ -54,7 +56,7 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
Port = postActivationFunc(config);
|
||||
|
||||
Port.StreamCec.CecChange += StreamCec_CecChange;
|
||||
TryEnsureCecSubscription();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +70,29 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
Port = port;
|
||||
|
||||
TryEnsureCecSubscription();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Subscribes to the CEC change event once <see cref="ICec.StreamCec"/> is available.
|
||||
/// Safe to call repeatedly; the subscription is only wired a single time.
|
||||
/// If StreamCec is null during construction, this is retried when send methods invoke
|
||||
/// this method later.
|
||||
/// </summary>
|
||||
void TryEnsureCecSubscription()
|
||||
{
|
||||
if (_cecSubscribed)
|
||||
return;
|
||||
|
||||
if (Port?.StreamCec == null)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Warning, this, "StreamCec is not available; CEC feedback is deferred until the device is ready");
|
||||
return;
|
||||
}
|
||||
|
||||
Port.StreamCec.CecChange += new CecChangeEventHandler(StreamCec_CecChange);
|
||||
_cecSubscribed = true;
|
||||
Debug.LogMessage(LogEventLevel.Information, this, "Subscribed to CEC feedback");
|
||||
}
|
||||
|
||||
void StreamCec_CecChange(Cec cecDevice, CecEventArgs args)
|
||||
|
|
@ -104,8 +128,9 @@ namespace PepperDash.Essentials.Core
|
|||
/// </summary>
|
||||
public void SendText(string text)
|
||||
{
|
||||
if (Port == null)
|
||||
if (Port?.StreamCec == null)
|
||||
return;
|
||||
TryEnsureCecSubscription();
|
||||
this.PrintSentText(text);
|
||||
Port.StreamCec.Send.StringValue = text;
|
||||
}
|
||||
|
|
@ -115,8 +140,9 @@ namespace PepperDash.Essentials.Core
|
|||
/// </summary>
|
||||
public void SendBytes(byte[] bytes)
|
||||
{
|
||||
if (Port == null)
|
||||
if (Port?.StreamCec == null)
|
||||
return;
|
||||
TryEnsureCecSubscription();
|
||||
var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
|
||||
this.PrintSentBytes(bytes);
|
||||
Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
using System;
|
||||
|
||||
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines the contract for a wireless presentation endpoint that reports whether a wireless
|
||||
/// sharing session is currently active. Implemented by platforms such as Crestron AirMedia,
|
||||
/// Mersive Solstice, Barco ClickShare, Miracast/Teams receivers, etc. Allows consumers (e.g.
|
||||
/// room plugins) to react to wireless sharing activity without taking a dependency on any
|
||||
/// concrete device implementation.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// This refers specifically to wireless screen/device mirroring, as distinct from in-call
|
||||
/// content sharing on a video conference.
|
||||
/// </remarks>
|
||||
public interface IHasWirelessSharing
|
||||
{
|
||||
/// <summary>
|
||||
/// Reports whether a wireless sharing session is currently active (content is being presented).
|
||||
/// </summary>
|
||||
BoolFeedback IsSharingFeedback { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Raised when wireless sharing starts or stops. The event args carry the new sharing state.
|
||||
/// </summary>
|
||||
event EventHandler<WirelessSharingEventArgs> SharingChanged;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Event arguments describing a change in wireless sharing state.
|
||||
/// </summary>
|
||||
public class WirelessSharingEventArgs : EventArgs
|
||||
{
|
||||
/// <summary>
|
||||
/// True if a wireless sharing session is active (content is being presented), false otherwise.
|
||||
/// </summary>
|
||||
public bool IsSharing { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new <see cref="WirelessSharingEventArgs"/>.
|
||||
/// </summary>
|
||||
/// <param name="isSharing">True if a wireless sharing session is active, false otherwise.</param>
|
||||
public WirelessSharingEventArgs(bool isSharing)
|
||||
{
|
||||
IsSharing = isSharing;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
using System;
|
||||
|
||||
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Interface for network switches that support VLAN assignment on individual ports.
|
||||
/// </summary>
|
||||
public interface INetworkSwitchVlanManager
|
||||
{
|
||||
/// <summary>
|
||||
/// Returns the current access VLAN ID configured on the port.
|
||||
/// Return -1 when the value is unavailable (e.g. the switch has not been polled yet
|
||||
/// or the implementation does not support VLAN queries).
|
||||
/// </summary>
|
||||
/// <param name="port">Switch port identifier</param>
|
||||
/// <returns>VLAN ID or -1 when unavailable</returns>
|
||||
int GetPortCurrentVlan(string port);
|
||||
|
||||
/// <summary>
|
||||
/// Changes the access VLAN of a single switch port.
|
||||
/// The implementation is responsible for entering/exiting privileged/config mode.
|
||||
/// </summary>
|
||||
/// <param name="port">Switch port identifier (e.g. "1/0/3" for Netgear, "gi1/0/3" for Cisco)</param>
|
||||
/// <param name="vlanId">Target VLAN ID (1-4093)</param>
|
||||
void SetPortVlan(string port, uint vlanId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Interface for network switches that support Power over Ethernet (PoE) control on individual ports.
|
||||
/// </summary>
|
||||
public interface INetworkSwitchPoeManager
|
||||
{
|
||||
/// <summary>
|
||||
/// Enables or disables PoE power delivery on a single switch port.
|
||||
/// The implementation is responsible for entering/exiting privileged/config mode.
|
||||
/// </summary>
|
||||
/// <param name="port">Switch port identifier</param>
|
||||
/// <param name="enabled">True to enable PoE; false to disable PoE</param>
|
||||
void SetPortPoeState(string port, bool enabled);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Standardized interface for network switch devices that support per-port PoE control
|
||||
/// and VLAN assignment.
|
||||
/// </summary>
|
||||
public interface INetworkSwitchPoeVlanManager : INetworkSwitchVlanManager, INetworkSwitchPoeManager
|
||||
{
|
||||
/// <summary>
|
||||
/// Event that is raised when the state of a switch port changes, such as a VLAN change or PoE state change.
|
||||
/// </summary>
|
||||
event EventHandler<NetworkSwitchPortEventArgs> PortStateChanged;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Event arguments for port state changes on a network switch, such as VLAN changes or PoE state changes.
|
||||
/// </summary>
|
||||
public class NetworkSwitchPortEventArgs : EventArgs
|
||||
{
|
||||
/// <summary>
|
||||
/// The identifier of the port that changed state (e.g. "1/0/3" for Netgear, "gi1/0/3" for Cisco).
|
||||
/// </summary>
|
||||
public string Port { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// The type of event that occurred on the port (e.g. VLAN change, PoE enabled/disabled).
|
||||
/// </summary>
|
||||
public NetworkSwitchPortEventType EventType { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Constructor for NetworkSwitchPortEventArgs
|
||||
/// </summary>
|
||||
/// <param name="port">The identifier of the port that changed state</param>
|
||||
/// <param name="eventType">The type of event that occurred on the port</param>
|
||||
public NetworkSwitchPortEventArgs(string port, NetworkSwitchPortEventType eventType)
|
||||
{
|
||||
Port = port;
|
||||
EventType = eventType;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Enumeration of network switch port state change event types (e.g. VLAN changes or PoE state changes).
|
||||
/// </summary>
|
||||
public enum NetworkSwitchPortEventType
|
||||
{
|
||||
/// <summary>
|
||||
/// Indicates that the type of event is unknown or cannot be determined.
|
||||
/// </summary>
|
||||
Unknown,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that a VLAN change is in progress on the port, either through a call to SetPortVlan or an external change detected by polling.
|
||||
/// </summary>
|
||||
VlanChangeInProgress,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that the access VLAN on a port has changed, either through a successful call to SetPortVlan or an external change detected by polling.
|
||||
/// </summary>
|
||||
VlanChanged,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE is being disabled on the port, either through a call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoeDisableInProgress,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE has been disabled on the port, either through a successful call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoEDisabled,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE is being enabled on the port, either through a call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoeEnableInProgress,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE has been enabled on the port, either through a successful call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoEEnabled
|
||||
}
|
||||
}
|
||||
|
|
@ -343,12 +343,14 @@ namespace PepperDash.Essentials.Core
|
|||
IndexTieLines();
|
||||
}
|
||||
|
||||
var sinks = DeviceManager.AllDevices.OfType<IRoutingInputs>();
|
||||
var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>();
|
||||
var sinks = DeviceManager.AllDevices.OfType<IRoutingInputs>()
|
||||
.Where(d => !(d is IRoutingInputsOutputs)).ToList();
|
||||
var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>()
|
||||
.Where(d => !(d is IRoutingInputsOutputs)).ToList();
|
||||
|
||||
foreach (var sink in sinks.Where(d => !(d is IRoutingInputsOutputs)))
|
||||
foreach (var sink in sinks)
|
||||
{
|
||||
foreach (var source in sources.Where(d => !(d is IRoutingInputsOutputs)))
|
||||
foreach (var source in sources)
|
||||
{
|
||||
foreach (var inputPort in sink.InputPorts)
|
||||
{
|
||||
|
|
@ -373,6 +375,10 @@ namespace PepperDash.Essentials.Core
|
|||
continue;
|
||||
}
|
||||
|
||||
Debug.LogVerbose("Route mapped: {source} -> {sink} via {input}/{output}, type {type}",
|
||||
source.Key, sink.Key,
|
||||
inputPort.Key, outputPort.Key, audioOrSingleRoute.SignalType);
|
||||
|
||||
// Add to the appropriate collection(s) based on signal type
|
||||
// Note: A single route descriptor with combined flags (e.g., AudioVideo) will be added once per matching signal type
|
||||
if (audioOrSingleRoute.SignalType.HasFlag(eRoutingSignalType.Audio))
|
||||
|
|
@ -404,6 +410,10 @@ namespace PepperDash.Essentials.Core
|
|||
continue;
|
||||
}
|
||||
|
||||
Debug.LogVerbose("Video route mapped: {source} -> {sink} via {input}/{output}",
|
||||
source.Key, sink.Key,
|
||||
inputPort.Key, outputPort.Key);
|
||||
|
||||
RouteDescriptors[eRoutingSignalType.Video].AddRouteDescriptor(videoRoute);
|
||||
}
|
||||
}
|
||||
|
|
@ -609,10 +619,12 @@ namespace PepperDash.Essentials.Core
|
|||
|
||||
// No direct tie? Run back out on the inputs' attached devices...
|
||||
// Only the ones that are routing devices
|
||||
var midpointTieLines = destinationTieLines.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
|
||||
|
||||
Debug.LogVerbose(destination, "Found {tieLineCount} tie lines to walk for {destinationKey}", midpointTieLines.Count(), destination.Key);
|
||||
var midpointTieLines = destinationTieLines
|
||||
.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs)
|
||||
.ToList();
|
||||
|
||||
Debug.LogVerbose(destination, "Found {tieLineCount} tie lines to walk for {destinationKey}", midpointTieLines.Count, destination.Key);
|
||||
|
||||
//Create a list for tracking already checked devices to avoid loops, if it doesn't already exist from previous iteration
|
||||
if (alreadyCheckedDevices == null)
|
||||
alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
using System.Linq;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Crestron.SimplSharp.WebScripting;
|
||||
using Newtonsoft.Json;
|
||||
using PepperDash.Core.Web.RequestHandlers;
|
||||
|
||||
namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a GetFeedbacksForDeviceRequestHandler
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// Represents a GetFeedbacksForDeviceRequestHandler
|
||||
/// </summary>
|
||||
public class GetFeedbacksForDeviceRequestHandler : WebApiBaseRequestHandler
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -76,7 +77,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
|||
Value = feedback.IntValue
|
||||
};
|
||||
|
||||
var stringFeedback =
|
||||
var stringFeedback =
|
||||
from feedback in device.Feedbacks.OfType<StringFeedback>()
|
||||
where !string.IsNullOrEmpty(feedback.Key)
|
||||
select new
|
||||
|
|
|
|||
|
|
@ -152,6 +152,15 @@ namespace PepperDash.Essentials.Devices.Common.Shades
|
|||
|
||||
private void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
|
||||
{
|
||||
if (Config.DisableAutoRaiseOnPowerOff)
|
||||
{
|
||||
this.LogDebug(
|
||||
"Auto-raise on power-off disabled for {type}; leaving position unchanged (manual control only)",
|
||||
Type
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
!DisplayDevice.IsCoolingDownFeedback.BoolValue
|
||||
&& Type == eScreenLiftControlType.lift
|
||||
|
|
@ -174,6 +183,15 @@ namespace PepperDash.Essentials.Devices.Common.Shades
|
|||
{
|
||||
if (DisplayDevice.IsWarmingUpFeedback.BoolValue)
|
||||
{
|
||||
if (Config.DisableAutoLowerOnPowerOn)
|
||||
{
|
||||
this.LogDebug(
|
||||
"Auto-lower on power-on disabled for {type}; leaving position unchanged (manual control only)",
|
||||
Type
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
Lower();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,5 +41,23 @@ namespace PepperDash.Essentials.Devices.Common.Shades
|
|||
/// </summary>
|
||||
[JsonProperty("muteOnScreenUp")]
|
||||
public bool MuteOnScreenUp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When true, this controller does NOT automatically lower when its assigned display powers on
|
||||
/// (warms up). Manual Raise/Lower still work, and the power-off auto-raise is unaffected. Intended
|
||||
/// for a projector screen that must not auto-drop in a public space for safety, while the projector
|
||||
/// lift (a separate controller) can still drop automatically.
|
||||
/// </summary>
|
||||
[JsonProperty("disableAutoLowerOnPowerOn")]
|
||||
public bool DisableAutoLowerOnPowerOn { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When true, this controller does NOT automatically raise when its assigned display powers off
|
||||
/// (cools down). Manual Raise/Lower still work, and the power-on auto-lower is unaffected. The
|
||||
/// companion to <see cref="DisableAutoLowerOnPowerOn"/>; together they make a controller fully
|
||||
/// manual while leaving other controllers (e.g. the lift) on their default automatic behavior.
|
||||
/// </summary>
|
||||
[JsonProperty("disableAutoRaiseOnPowerOff")]
|
||||
public bool DisableAutoRaiseOnPowerOff { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
|
|||
/// <summary>
|
||||
/// The device key
|
||||
/// </summary>
|
||||
[JsonProperty("key")]
|
||||
[JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
|
||||
/// <summary>
|
||||
/// Gets or sets the Key
|
||||
/// </summary>
|
||||
|
|
@ -19,19 +19,19 @@ namespace PepperDash.Essentials.AppServer.Messengers
|
|||
/// <summary>
|
||||
/// The device name
|
||||
/// </summary>
|
||||
[JsonProperty("name")]
|
||||
[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The type of the message class
|
||||
/// </summary>
|
||||
[JsonProperty("messageType")]
|
||||
[JsonProperty("messageType", NullValueHandling = NullValueHandling.Ignore)]
|
||||
public string MessageType => GetType().Name;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the MessageBasePath
|
||||
/// </summary>
|
||||
[JsonProperty("messageBasePath")]
|
||||
[JsonProperty("messageBasePath", NullValueHandling = NullValueHandling.Ignore)]
|
||||
|
||||
public string MessageBasePath { get; set; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
|
|||
/// <summary>
|
||||
/// The interfaces implmented by the device sending the messsage
|
||||
/// </summary>
|
||||
[JsonProperty("interfaces")]
|
||||
[JsonProperty("interfaces", NullValueHandling = NullValueHandling.Ignore)]
|
||||
[Obsolete("Interfaces are no longer supported and will be removed in a future release. Interfaces for all devices are now retrieved via the /joinroom endpoint in the MobileControlWebsocketServer")]
|
||||
public List<string> Interfaces { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue