From 891feecca114fc28a79e5d0bac3f98c4dae45d10 Mon Sep 17 00:00:00 2001 From: Trevor Payne Date: Wed, 4 Mar 2020 15:09:11 -0600 Subject: [PATCH] Various Occsensor Fixes From Beta Build --- .../GlsOccupancySensorBaseControllerBridge.cs | 9 +++++++++ .../JoinMaps/GlsOccupancySensorBaseJoinMap.cs | 1 - PepperDashEssentials/Properties/AssemblyInfo.cs | 2 +- .../AirMedia/AirMediaController.cs | 5 ++++- .../Essentials_DM/Config/DeviceFactory.cs | 17 ++++++++++------- essentials-framework/pepperdashcore-builds | 2 +- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs b/PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs index ae2a3f9d..d905beef 100644 --- a/PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs +++ b/PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs @@ -33,6 +33,15 @@ namespace PepperDash.Essentials.Bridges occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]); trilist.StringInput[joinMap.Name].StringValue = occController.Name; + trilist.OnlineStatusChange += new Crestron.SimplSharpPro.OnlineStatusChangeEventHandler((d, args) => + { + if (args.DeviceOnLine) + { + trilist.StringInput[joinMap.Name].StringValue = occController.Name; + } + } + ); + // Occupied status trilist.SetSigTrueAction(joinMap.ForceOccupied, new Action(() => occController.ForceOccupied())); trilist.SetSigTrueAction(joinMap.ForceVacant, new Action(() => occController.ForceVacant())); diff --git a/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs index bd7e491d..6e19dff2 100644 --- a/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs +++ b/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs @@ -213,7 +213,6 @@ namespace PepperDash.Essentials.Bridges DisableUsB = DisableUsB + joinOffset; EnablePir = EnablePir + joinOffset; DisablePir = DisablePir + joinOffset; - DisablePir = DisablePir + joinOffset; IncrementUsInOccupiedState = IncrementUsInOccupiedState + joinOffset; DecrementUsInOccupiedState = DecrementUsInOccupiedState + joinOffset; IncrementUsInVacantState = IncrementUsInVacantState + joinOffset; diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs index 83beada4..531267a0 100644 --- a/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] -[assembly: AssemblyVersion("1.4.0.*")] +[assembly: AssemblyVersion("0.0.0.*")] diff --git a/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs b/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs index 1624ec5f..28358a51 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs @@ -44,7 +44,10 @@ namespace PepperDash.Essentials.DM.AirMedia DeviceConfig = dc; - PropertiesConfig = props; + PropertiesConfig = props; + + InputPorts = new RoutingPortCollection(); + OutputPorts = new RoutingPortCollection(); InputPorts.Add(new RoutingInputPort(DmPortName.Osd, eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, new Action(SelectPinPointUxLandingPage), this)); diff --git a/essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs b/essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs index d3fda242..2417ce7e 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Config/DeviceFactory.cs @@ -30,14 +30,17 @@ namespace PepperDash.Essentials.DM if (typeName.StartsWith("am")) { - var props = JsonConvert.DeserializeObject(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(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")) { diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds index 27a665b6..15206840 160000 --- a/essentials-framework/pepperdashcore-builds +++ b/essentials-framework/pepperdashcore-builds @@ -1 +1 @@ -Subproject commit 27a665b68a0725729bb09138bb85f575833df4b2 +Subproject commit 15206840b3e6338f695e4ffba634a72e51ea1be5