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

Various Occsensor Fixes From Beta Build

Browse source
This commit is contained in:
Trevor Payne 2020-03-04 15:09:11 -06:00
parent 1cf5aafa03
commit 891feecca1
6 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs
View file

@ -44,7 +44,10 @@ namespace PepperDash.Essentials.DM.AirMedia
DeviceConfig = dc;
PropertiesConfig = props;
PropertiesConfig = props;
InputPorts = new RoutingPortCollection<RoutingInputPort>();
OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
InputPorts.Add(new RoutingInputPort(DmPortName.Osd, eRoutingSignalType.Audio | eRoutingSignalType.Video,
eRoutingPortConnectionType.None, new Action(SelectPinPointUxLandingPage), this));

17
essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs
View file

@ -30,14 +30,17 @@ namespace PepperDash.Essentials.DM
if (typeName.StartsWith("am"))
{
var props = JsonConvert.DeserializeObject<AirMediaPropertiesConfig>(properties.ToString());
AmX00 amDevice = null;
if (typeName == "am200")
amDevice = new Crestron.SimplSharpPro.DM.AirMedia.Am200(props.Control.IpIdInt, Global.ControlSystem);
else if(typeName == "am300")
amDevice = new Crestron.SimplSharpPro.DM.AirMedia.Am300(props.Control.IpIdInt, Global.ControlSystem);
if (typeName == "am200" || typeName == "am300")
{
var props = JsonConvert.DeserializeObject<AirMediaPropertiesConfig>(properties.ToString());
AmX00 amDevice = null;
if (typeName == "am200")
amDevice = new Crestron.SimplSharpPro.DM.AirMedia.Am200(props.Control.IpIdInt, Global.ControlSystem);
else if (typeName == "am300")
amDevice = new Crestron.SimplSharpPro.DM.AirMedia.Am300(props.Control.IpIdInt, Global.ControlSystem);
return new AirMediaController(key, name, amDevice, dc, props);
return new AirMediaController(key, name, amDevice, dc, props);
}
}
else if (typeName.StartsWith("dmmd8x") || typeName.StartsWith("dmmd16x") || typeName.StartsWith("dmmd32x"))
{

2
essentials-framework/pepperdashcore-builds

@ -1 +1 @@
Subproject commit 27a665b68a0725729bb09138bb85f575833df4b2
Subproject commit 15206840b3e6338f695e4ffba634a72e51ea1be5