Merge pull request #621 from PepperDash/bugfix/occSensor-fixes

Multiple Occ Sensor Updates

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -154,7 +154,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("PirSensitivityInVacantState")]
         public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Occ Sensor Ultrasonic Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Occ Sensor PIR Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
@@ -15,11 +11,11 @@ namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for Single Technology GLS Occupancy Sensors")]
     [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0}")]
-	public class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
+	public abstract class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
 	{
         public GlsOccupancySensorPropertiesConfig PropertiesConfig { get; private set; }
 
-		public GlsOccupancySensorBase OccSensor { get; private set; }
+	    protected GlsOccupancySensorBase OccSensor;
 
 		public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
 
@@ -58,44 +54,12 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-		public GlsOccupancySensorBaseController(string key, Func<DeviceConfig, GlsOccupancySensorBase> preActivationFunc,
+	    protected GlsOccupancySensorBaseController(string key, DeviceConfig config)
-			DeviceConfig config)
+			: this(key, config.Name, config)
-			: base(key, config.Name)
 		{
-            var props = config.Properties.ToObject<GlsOccupancySensorPropertiesConfig>();
-
-            if (props != null)
-            {
-                PropertiesConfig = props;
-            }
-            else
-            {
-                Debug.Console(1, this, "props are null.  Unable to deserialize into GlsOccupancySensorPropertiesConfig");
-            }
-
-			AddPreActivationAction(() =>
-			{
-				OccSensor = preActivationFunc(config);
-
-				RegisterCrestronGenericBase(OccSensor);
-
-				RegisterGlsOdtSensorBaseController(OccSensor);
-
-			});
-
-            AddPostActivationAction(() =>
-            {
-                OccSensor.OnlineStatusChange += (o, a) =>
-                {
-                    if (a.DeviceOnLine)
-                    {
-                        ApplySettingsToSensorFromConfig();
-                    }
-                };
-            });            
 		}
 
-		public GlsOccupancySensorBaseController(string key, string name, DeviceConfig config)
+	    protected GlsOccupancySensorBaseController(string key, string name, DeviceConfig config)
             : base(key, name) 
         {
 
@@ -183,7 +147,7 @@ namespace PepperDash.Essentials.Core
             }
         }
 
-		protected void RegisterGlsOdtSensorBaseController(GlsOccupancySensorBase occSensor)
+		protected void RegisterGlsOccupancySensorBaseController(GlsOccupancySensorBase occSensor)
 		{
 			OccSensor = occSensor;
 
@@ -253,8 +217,8 @@ namespace PepperDash.Essentials.Core
 
 			switch (args.EventId)
 			{
-				case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomVacantFeedbackEventId:
+				case GlsOccupancySensorBase.RoomVacantFeedbackEventId:
-				case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomOccupiedFeedbackEventId:
+				case GlsOccupancySensorBase.RoomOccupiedFeedbackEventId:
 					Debug.Console(1, this, "Occupancy State: {0}", OccSensor.OccupancyDetectedFeedback.BoolValue);
 					RoomIsOccupiedFeedback.FireUpdate();
 					break;
@@ -298,63 +262,39 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-		/// <summary>
+	    /// <summary>
-		/// Enables or disables the PIR sensor
+	    /// Enables or disables the PIR sensor
-		/// </summary>
+	    /// </summary>
-		/// <param name="state"></param>
+	    /// <param name="state"></param>
-		public void SetPirEnable(bool state)
+	    public void SetPirEnable(bool state)
-		{
+	    {
-            Debug.Console(1, this, "Setting EnablePir to: {0}", state);
+	        Debug.Console(1, this, "Setting EnablePir to: {0}", state);
 
-			if (state)
+	        OccSensor.EnablePir.BoolValue = state;
-			{
+	        OccSensor.DisablePir.BoolValue = !state;
-				OccSensor.EnablePir.BoolValue = state;
+	    }
-				OccSensor.DisablePir.BoolValue = !state;
-			}
-			else
-			{
-				OccSensor.EnablePir.BoolValue = state;
-				OccSensor.DisablePir.BoolValue = !state;
-			}
-		}
 
-		/// <summary>
+	    /// <summary>
-		/// Enables or disables the LED Flash
+	    /// Enables or disables the LED Flash
-		/// </summary>
+	    /// </summary>
-		/// <param name="state"></param>
+	    /// <param name="state"></param>
-		public void SetLedFlashEnable(bool state)
+	    public void SetLedFlashEnable(bool state)
-		{
+	    {
-			if (state)
+	        OccSensor.EnableLedFlash.BoolValue = state;
-			{
+	        OccSensor.DisableLedFlash.BoolValue = !state;
-				OccSensor.EnableLedFlash.BoolValue = state;
+	    }
-				OccSensor.DisableLedFlash.BoolValue = !state;
-			}
-			else
-			{
-				OccSensor.EnableLedFlash.BoolValue = state;
-				OccSensor.DisableLedFlash.BoolValue = !state;
-			}
-		}
 
-		/// <summary>
+	    /// <summary>
-		/// Enables or disables short timeout based on state
+	    /// Enables or disables short timeout based on state
-		/// </summary>
+	    /// </summary>
-		/// <param name="state"></param>
+	    /// <param name="state"></param>
-		public void SetShortTimeoutState(bool state)
+	    public void SetShortTimeoutState(bool state)
-		{
+	    {
-			if (state)
+	        OccSensor.EnableShortTimeout.BoolValue = state;
-			{
+	        OccSensor.DisableShortTimeout.BoolValue = !state;
-				OccSensor.EnableShortTimeout.BoolValue = state;
+	    }
-				OccSensor.DisableShortTimeout.BoolValue = !state;
-			}
-			else
-			{
-				OccSensor.EnableShortTimeout.BoolValue = state;
-				OccSensor.DisableShortTimeout.BoolValue = !state;
-			}
-		}
 
-		public void IncrementPirSensitivityInOccupiedState(bool pressRelease)
+	    public void IncrementPirSensitivityInOccupiedState(bool pressRelease)
 		{
 			OccSensor.IncrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
 		}
@@ -374,14 +314,40 @@ namespace PepperDash.Essentials.Core
 			OccSensor.DecrementPirSensitivityInVacantState.BoolValue = pressRelease;
 		}
 
-		public void ForceOccupied()
+        /// <summary>
+        /// Pulse ForceOccupied on the sensor for .5 seconds
+        /// </summary>
+	    public void ForceOccupied()
+	    {
+	        CrestronInvoke.BeginInvoke((o) =>
+	        {
+	            ForceOccupied(true);
+	            CrestronEnvironment.Sleep(500);
+	            ForceOccupied(false);
+	        });
+	    }
+
+		public void ForceOccupied(bool value)
 		{
-			OccSensor.ForceOccupied.BoolValue = true;
+			OccSensor.ForceOccupied.BoolValue = value;
 		}
 
-		public void ForceVacant()
+        /// <summary>
+        /// Pulse ForceVacant on the sensor for .5 seconds
+        /// </summary>
+	    public void ForceVacant()
+	    {
+            CrestronInvoke.BeginInvoke((o) =>
+            {
+                ForceVacant(true);
+                CrestronEnvironment.Sleep(500);
+                ForceVacant(false);
+            });
+	    }
+
+		public void ForceVacant(bool value)
 		{
-			OccSensor.ForceVacant.BoolValue = true;
+			OccSensor.ForceVacant.BoolValue = value;
 		}
 
 		public void EnableRawStates(bool state)
@@ -406,11 +372,10 @@ namespace PepperDash.Essentials.Core
 			OccSensor.ExternalPhotoSensorMinimumChange.UShortValue = value;
 		}
 
-		/// <summary>
+	    /// <summary>
-		/// Method to print current occ settings to console.
+	    /// Method to print current occ settings to console.
-		/// </summary>
+	    /// </summary>
-		/// <param name="key"></param>
+	    public virtual void GetSettings()
-		public virtual void GetSettings()
 		{
 			var dash = new string('*', 50);
 			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
@@ -454,7 +419,6 @@ namespace PepperDash.Essentials.Core
 
 			Debug.Console(1, occController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
-			#region Single and Dual Sensor Stuff
 			occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
 			trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
 
@@ -466,131 +430,108 @@ namespace PepperDash.Essentials.Core
 				}
 			};
 
-			// Occupied status
+			LinkSingleTechSensorToApi(occController, trilist, joinMap);
-			trilist.SetSigTrueAction(joinMap.ForceOccupied.JoinNumber, occController.ForceOccupied);
-			trilist.SetSigTrueAction(joinMap.ForceVacant.JoinNumber, occController.ForceVacant);
-			occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback.JoinNumber]);
-			occController.RoomIsOccupiedFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.RoomVacantFeedback.JoinNumber]);
-			occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback.JoinNumber]);
-			trilist.SetBoolSigAction(joinMap.EnableRawStates.JoinNumber, occController.EnableRawStates);
 
-			// Timouts
+			LinkDualTechSensorToApi(occController, trilist, joinMap);
-			trilist.SetUShortSigAction(joinMap.Timeout.JoinNumber, occController.SetRemoteTimeout);
-			occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout.JoinNumber]);
-			occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback.JoinNumber]);
-
-			// LED Flash
-			trilist.SetSigTrueAction(joinMap.EnableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(true));
-			trilist.SetSigTrueAction(joinMap.DisableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(false));
-			occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash.JoinNumber]);
-
-			// Short Timeout
-			trilist.SetSigTrueAction(joinMap.EnableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(true));
-			trilist.SetSigTrueAction(joinMap.DisableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(false));
-			occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout.JoinNumber]);
-
-			// PIR Sensor
-			trilist.SetSigTrueAction(joinMap.EnablePir.JoinNumber, () => occController.SetPirEnable(true));
-			trilist.SetSigTrueAction(joinMap.DisablePir.JoinNumber, () => occController.SetPirEnable(false));
-			occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir.JoinNumber]);
-
-			// PIR Sensitivity in Occupied State
-			trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState.JoinNumber, occController.IncrementPirSensitivityInOccupiedState);
-			trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState.JoinNumber, occController.DecrementPirSensitivityInOccupiedState);
-			occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInOccupiedState.JoinNumber]);
-
-			// PIR Sensitivity in Vacant State
-			trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState.JoinNumber, occController.IncrementPirSensitivityInVacantState);
-			trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState.JoinNumber, occController.DecrementPirSensitivityInVacantState);
-			occController.PirSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInVacantState.JoinNumber]);
-			#endregion
-
-			#region Dual Technology Sensor Stuff
-			var odtOccController = occController as GlsOdtOccupancySensorController;
-
-			if (odtOccController == null) return;
-			// OR When Vacated
-			trilist.SetBoolSigAction(joinMap.OrWhenVacated.JoinNumber, odtOccController.SetOrWhenVacatedState);
-			odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated.JoinNumber]);
-
-			// AND When Vacated
-			trilist.SetBoolSigAction(joinMap.AndWhenVacated.JoinNumber, odtOccController.SetAndWhenVacatedState);
-			odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated.JoinNumber]);
-
-			// Ultrasonic A Sensor
-			trilist.SetSigTrueAction(joinMap.EnableUsA.JoinNumber, () => odtOccController.SetUsAEnable(true));
-			trilist.SetSigTrueAction(joinMap.DisableUsA.JoinNumber, () => odtOccController.SetUsAEnable(false));
-			odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA.JoinNumber]);
-
-			// Ultrasonic B Sensor
-			trilist.SetSigTrueAction(joinMap.EnableUsB.JoinNumber, () => odtOccController.SetUsBEnable(true));
-			trilist.SetSigTrueAction(joinMap.DisableUsB.JoinNumber, () => odtOccController.SetUsBEnable(false));
-			odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB.JoinNumber]);
-
-			// US Sensitivity in Occupied State
-			trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState.JoinNumber, odtOccController.IncrementUsSensitivityInOccupiedState);
-			trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState.JoinNumber, odtOccController.DecrementUsSensitivityInOccupiedState);
-			odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInOccupiedState.JoinNumber]);
-
-			// US Sensitivity in Vacant State
-			trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState.JoinNumber, odtOccController.IncrementUsSensitivityInVacantState);
-			trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState.JoinNumber, odtOccController.DecrementUsSensitivityInVacantState);
-			odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInVacantState.JoinNumber]);
-
-			//Sensor Raw States
-			odtOccController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
-			odtOccController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
-
-			#endregion
 		}
 
-		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+	    private static void LinkDualTechSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
-		{
+	        GlsOccupancySensorBaseJoinMap joinMap)
-			LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+	    {
-		}
+	        var odtOccController = occController as GlsOdtOccupancySensorController;
 
-		#region PreActivation
+	        if (odtOccController == null)
+	        {
+	            return;
+	        }
+	        // OR When Vacated
+	        trilist.SetBoolSigAction(joinMap.OrWhenVacated.JoinNumber, odtOccController.SetOrWhenVacatedState);
+	        odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated.JoinNumber]);
 
-		private static GlsOirCCn GetGlsOirCCn(DeviceConfig dc)
+	        // AND When Vacated
-		{
+	        trilist.SetBoolSigAction(joinMap.AndWhenVacated.JoinNumber, odtOccController.SetAndWhenVacatedState);
-			var control = CommFactory.GetControlPropertiesConfig(dc);
+	        odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated.JoinNumber]);
-			var cresnetId = control.CresnetIdInt;
-			var branchId = control.ControlPortNumber;
-			var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
 
-			if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+	        // Ultrasonic A Sensor
-			{
+	        trilist.SetSigTrueAction(joinMap.EnableUsA.JoinNumber, () => odtOccController.SetUsAEnable(true));
-				Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
+	        trilist.SetSigTrueAction(joinMap.DisableUsA.JoinNumber, () => odtOccController.SetUsAEnable(false));
-				return new GlsOirCCn(cresnetId, Global.ControlSystem);
+	        odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA.JoinNumber]);
-			}
-			var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
 
-			if (cresnetBridge != null)
+	        // Ultrasonic B Sensor
-			{
+	        trilist.SetSigTrueAction(joinMap.EnableUsB.JoinNumber, () => odtOccController.SetUsBEnable(true));
-				Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
+	        trilist.SetSigTrueAction(joinMap.DisableUsB.JoinNumber, () => odtOccController.SetUsBEnable(false));
-				return new GlsOirCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+	        odtOccController.UltrasonicBEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB.JoinNumber]);
-			}
-			Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-			return null;
-		}
-		#endregion
 
-		public class GlsOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<GlsOccupancySensorBaseController>
+	        // US Sensitivity in Occupied State
-		{
+	        trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState.JoinNumber,
-			public GlsOccupancySensorBaseControllerFactory()
+	            odtOccController.IncrementUsSensitivityInOccupiedState);
-			{
+	        trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState.JoinNumber,
-				TypeNames = new List<string>() { "glsoirccn" };
+	            odtOccController.DecrementUsSensitivityInOccupiedState);
-			}
+	        odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(
+	            trilist.UShortInput[joinMap.UsSensitivityInOccupiedState.JoinNumber]);
 
+	        // US Sensitivity in Vacant State
+	        trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState.JoinNumber,
+	            odtOccController.IncrementUsSensitivityInVacantState);
+	        trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState.JoinNumber,
+	            odtOccController.DecrementUsSensitivityInVacantState);
+	        odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(
+	            trilist.UShortInput[joinMap.UsSensitivityInVacantState.JoinNumber]);
 
-			public override EssentialsDevice BuildDevice(DeviceConfig dc)
+	        //Sensor Raw States
-			{
+	        odtOccController.RawOccupancyPirFeedback.LinkInputSig(
-				Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+	            trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
+	        odtOccController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
+	    }
 
-				return new GlsOccupancySensorBaseController(dc.Key, GetGlsOirCCn, dc);
+	    private static void LinkSingleTechSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
-			}
+	        GlsOccupancySensorBaseJoinMap joinMap)
+	    {
+// Occupied status
+	        trilist.SetBoolSigAction(joinMap.ForceOccupied.JoinNumber, occController.ForceOccupied);
+	        trilist.SetBoolSigAction(joinMap.ForceVacant.JoinNumber, occController.ForceVacant);
+	        occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback.JoinNumber]);
+	        occController.RoomIsOccupiedFeedback.LinkComplementInputSig(
+	            trilist.BooleanInput[joinMap.RoomVacantFeedback.JoinNumber]);
+	        occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback.JoinNumber]);
+	        trilist.SetBoolSigAction(joinMap.EnableRawStates.JoinNumber, occController.EnableRawStates);
 
-		}
+	        // Timouts
+	        trilist.SetUShortSigAction(joinMap.Timeout.JoinNumber, occController.SetRemoteTimeout);
+	        occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout.JoinNumber]);
+	        occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback.JoinNumber]);
+
+	        // LED Flash
+	        trilist.SetSigTrueAction(joinMap.EnableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(true));
+	        trilist.SetSigTrueAction(joinMap.DisableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(false));
+	        occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash.JoinNumber]);
+
+	        // Short Timeout
+	        trilist.SetSigTrueAction(joinMap.EnableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(true));
+	        trilist.SetSigTrueAction(joinMap.DisableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(false));
+	        occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout.JoinNumber]);
+
+	        // PIR Sensor
+	        trilist.SetSigTrueAction(joinMap.EnablePir.JoinNumber, () => occController.SetPirEnable(true));
+	        trilist.SetSigTrueAction(joinMap.DisablePir.JoinNumber, () => occController.SetPirEnable(false));
+	        occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir.JoinNumber]);
+
+	        // PIR Sensitivity in Occupied State
+	        trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState.JoinNumber,
+	            occController.IncrementPirSensitivityInOccupiedState);
+	        trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState.JoinNumber,
+	            occController.DecrementPirSensitivityInOccupiedState);
+	        occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(
+	            trilist.UShortInput[joinMap.PirSensitivityInOccupiedState.JoinNumber]);
+
+	        // PIR Sensitivity in Vacant State
+	        trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState.JoinNumber,
+	            occController.IncrementPirSensitivityInVacantState);
+	        trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState.JoinNumber,
+	            occController.DecrementPirSensitivityInVacantState);
+	        occController.PirSensitivityInVacantStateFeedback.LinkInputSig(
+	            trilist.UShortInput[joinMap.PirSensitivityInVacantState.JoinNumber]);
+	    }
 	}
 
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
@@ -17,7 +14,7 @@ namespace PepperDash.Essentials.Core
     [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0,\"enableUsA\": true,\"enableUsB\": true,\"orWhenVacatedState\": true}")]
     public class GlsOdtOccupancySensorController : GlsOccupancySensorBaseController
 	{
-		public new GlsOdtCCn OccSensor { get; private set; }
+	    private GlsOdtCCn _occSensor;
 
 		public BoolFeedback OrWhenVacatedFeedback { get; private set; }
 
@@ -42,31 +39,29 @@ namespace PepperDash.Essentials.Core
 		{
 			AddPreActivationAction(() =>
 			{
-				OccSensor = preActivationFunc(config);
+				_occSensor = preActivationFunc(config);
 
-				RegisterCrestronGenericBase(OccSensor);
+				RegisterCrestronGenericBase(_occSensor);
 
-				RegisterGlsOdtSensorBaseController(OccSensor);
+				RegisterGlsOccupancySensorBaseController(OccSensor);
 
-				AndWhenVacatedFeedback = new BoolFeedback(() => OccSensor.AndWhenVacatedFeedback.BoolValue);
+				AndWhenVacatedFeedback = new BoolFeedback(() => _occSensor.AndWhenVacatedFeedback.BoolValue);
 
-				OrWhenVacatedFeedback = new BoolFeedback(() => OccSensor.OrWhenVacatedFeedback.BoolValue);
+				OrWhenVacatedFeedback = new BoolFeedback(() => _occSensor.OrWhenVacatedFeedback.BoolValue);
 
-				UltrasonicAEnabledFeedback = new BoolFeedback(() => OccSensor.UsAEnabledFeedback.BoolValue);
+				UltrasonicAEnabledFeedback = new BoolFeedback(() => _occSensor.UsAEnabledFeedback.BoolValue);
 
-				UltrasonicBEnabledFeedback = new BoolFeedback(() => OccSensor.UsBEnabledFeedback.BoolValue);
+				UltrasonicBEnabledFeedback = new BoolFeedback(() => _occSensor.UsBEnabledFeedback.BoolValue);
 
-				RawOccupancyPirFeedback = new BoolFeedback(() => OccSensor.RawOccupancyPirFeedback.BoolValue);
+				RawOccupancyPirFeedback = new BoolFeedback(() => _occSensor.RawOccupancyPirFeedback.BoolValue);
 
-				RawOccupancyUsFeedback = new BoolFeedback(() => OccSensor.RawOccupancyUsFeedback.BoolValue);
+				RawOccupancyUsFeedback = new BoolFeedback(() => _occSensor.RawOccupancyUsFeedback.BoolValue);
 
-				UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInVacantStateFeedback.UShortValue);
+				UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => _occSensor.UsSensitivityInVacantStateFeedback.UShortValue);
-
-				UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue);
-
-			});		
 
+				UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => _occSensor.UsSensitivityInOccupiedStateFeedback.UShortValue);
 
+			});	
 		}
 
         protected override void ApplySettingsToSensorFromConfig()
@@ -114,45 +109,59 @@ namespace PepperDash.Essentials.Core
 		/// <param name="args"></param>
 		protected override void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
 		{
-			if (args.EventId == GlsOccupancySensorBase.AndWhenVacatedFeedbackEventId)
+		    switch (args.EventId)
-				AndWhenVacatedFeedback.FireUpdate();
+		    {
-			else if (args.EventId == GlsOccupancySensorBase.OrWhenVacatedFeedbackEventId)
+		        case GlsOccupancySensorBase.AndWhenVacatedFeedbackEventId:
-				OrWhenVacatedFeedback.FireUpdate();
+		            AndWhenVacatedFeedback.FireUpdate();
-			else if (args.EventId == GlsOccupancySensorBase.UsAEnabledFeedbackEventId)
+		            break;
-				UltrasonicAEnabledFeedback.FireUpdate();
+		        case GlsOccupancySensorBase.OrWhenVacatedFeedbackEventId:
-			else if (args.EventId == GlsOccupancySensorBase.UsBEnabledFeedbackEventId)
+		            OrWhenVacatedFeedback.FireUpdate();
-				UltrasonicBEnabledFeedback.FireUpdate();
+		            break;
-			else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInOccupiedStateFeedbackEventId)
+		        case GlsOccupancySensorBase.UsAEnabledFeedbackEventId:
-				UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
+		            UltrasonicAEnabledFeedback.FireUpdate();
-			else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId)
+		            break;
-				UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
+		        case GlsOccupancySensorBase.UsBEnabledFeedbackEventId:
+		            UltrasonicBEnabledFeedback.FireUpdate();
+		            break;
+		        case GlsOccupancySensorBase.UsSensitivityInOccupiedStateFeedbackEventId:
+		            UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
+		            break;
+		        case GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId:
+		            UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
+		            break;
+		    }
 
-			base.OccSensor_GlsOccupancySensorChange(device, args);
+		    base.OccSensor_GlsOccupancySensorChange(device, args);
 		}
 
-		/// <summary>
+	    /// <summary>
 		/// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
 		/// Then calls the base delegate method to ensure any common event IDs are captured.
 		/// </summary>
 		/// <param name="device"></param>
 		/// <param name="args"></param>
 		protected override void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
-		{
+	    {
-			if (args.EventId == GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId)
+	        switch (args.EventId)
-				RawOccupancyPirFeedback.FireUpdate();
+	        {
-			else if (args.EventId == GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId)
+	            case GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId:
-				RawOccupancyUsFeedback.FireUpdate();
+	                RawOccupancyPirFeedback.FireUpdate();
+	                break;
+	            case GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId:
+	                RawOccupancyUsFeedback.FireUpdate();
+	                break;
+	        }
 
-			base.OccSensor_BaseEvent(device, args);
+	        base.OccSensor_BaseEvent(device, args);
-		}
+	    }
 
-		/// <summary>
+	    /// <summary>
 		/// Sets the OrWhenVacated state
 		/// </summary>
 		/// <param name="state"></param>
 		public void SetOrWhenVacatedState(bool state)
 		{
-			OccSensor.OrWhenVacated.BoolValue = state;
+			_occSensor.OrWhenVacated.BoolValue = state;
 		}
 
 		/// <summary>
@@ -161,7 +170,7 @@ namespace PepperDash.Essentials.Core
 		/// <param name="state"></param>
 		public void SetAndWhenVacatedState(bool state)
 		{
-			OccSensor.AndWhenVacated.BoolValue = state;
+			_occSensor.AndWhenVacated.BoolValue = state;
 		}
 
 		/// <summary>
@@ -170,8 +179,8 @@ namespace PepperDash.Essentials.Core
 		/// <param name="state"></param>
 		public void SetUsAEnable(bool state)
 		{
-			OccSensor.EnableUsA.BoolValue = state;
+			_occSensor.EnableUsA.BoolValue = state;
-			OccSensor.DisableUsA.BoolValue = !state;
+			_occSensor.DisableUsA.BoolValue = !state;
 		}
 
 
@@ -181,28 +190,28 @@ namespace PepperDash.Essentials.Core
 		/// <param name="state"></param>
 		public void SetUsBEnable(bool state)
 		{
-			OccSensor.EnableUsB.BoolValue = state;
+			_occSensor.EnableUsB.BoolValue = state;
-			OccSensor.DisableUsB.BoolValue = !state;
+			_occSensor.DisableUsB.BoolValue = !state;
 		}
 
 		public void IncrementUsSensitivityInOccupiedState(bool pressRelease)
 		{
-			OccSensor.IncrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
+			_occSensor.IncrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
 		}
 
 		public void DecrementUsSensitivityInOccupiedState(bool pressRelease)
 		{
-			OccSensor.DecrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
+			_occSensor.DecrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
 		}
 
 		public void IncrementUsSensitivityInVacantState(bool pressRelease)
 		{
-			OccSensor.IncrementUsSensitivityInVacantState.BoolValue = pressRelease;
+			_occSensor.IncrementUsSensitivityInVacantState.BoolValue = pressRelease;
 		}
 
 		public void DecrementUsSensitivityInVacantState(bool pressRelease)
 		{
-			OccSensor.DecrementUsSensitivityInVacantState.BoolValue = pressRelease;
+			_occSensor.DecrementUsSensitivityInVacantState.BoolValue = pressRelease;
 		}
 
 		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
@@ -218,62 +227,58 @@ namespace PepperDash.Essentials.Core
             base.GetSettings();
 
 			Debug.Console(0, this, "Ultrasonic Enabled A: {0} | B: {1}",
-				OccSensor.UsAEnabledFeedback.BoolValue,
+				_occSensor.UsAEnabledFeedback.BoolValue,
-				OccSensor.UsBEnabledFeedback.BoolValue);
+				_occSensor.UsBEnabledFeedback.BoolValue);
 
 			Debug.Console(0, this, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}",
-				OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue,
+				_occSensor.UsSensitivityInOccupiedStateFeedback.UShortValue,
-				OccSensor.UsSensitivityInVacantStateFeedback.UShortValue);
+				_occSensor.UsSensitivityInVacantStateFeedback.UShortValue);
 
             var dash = new string('*', 50);
 			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
 		}
 
-
-		#region PreActivation
-
-		private static GlsOdtCCn GetGlsOdtCCn(DeviceConfig dc)
-		{
-			var control = CommFactory.GetControlPropertiesConfig(dc);
-			var cresnetId = control.CresnetIdInt;
-			var branchId = control.ControlPortNumber;
-			var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
-
-			if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
-			{
-				Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn", parentKey);
-				return new GlsOdtCCn(cresnetId, Global.ControlSystem);
-			}
-			var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
-
-			if (cresnetBridge != null)
-			{
-				Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn", parentKey);
-				return new GlsOdtCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-			}
-			Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-			return null;
-		}
-		#endregion
-
-		public class GlsOdtOccupancySensorControllerFactory : EssentialsDeviceFactory<GlsOdtOccupancySensorController>
-		{
-			public GlsOdtOccupancySensorControllerFactory()
-			{
-				TypeNames = new List<string>() { "glsodtccn" };
-			}
-
-
-			public override EssentialsDevice BuildDevice(DeviceConfig dc)
-			{
-				Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
-
-				return new GlsOdtOccupancySensorController(dc.Key, GetGlsOdtCCn, dc);
-			}
-
-		}
 	}
 
+    public class GlsOdtOccupancySensorControllerFactory : EssentialsDeviceFactory<GlsOdtOccupancySensorController>
+    {
+        public GlsOdtOccupancySensorControllerFactory()
+        {
+            TypeNames = new List<string> { "glsodtccn" };
+        }
+
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+
+            return new GlsOdtOccupancySensorController(dc.Key, GetGlsOdtCCn, dc);
+        }
+
+        private static GlsOdtCCn GetGlsOdtCCn(DeviceConfig dc)
+        {
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+            var cresnetId = control.CresnetIdInt;
+            var branchId = control.ControlPortNumber;
+            var parentKey = String.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
+
+            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn", parentKey);
+                return new GlsOdtCCn(cresnetId, Global.ControlSystem);
+            }
+            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
+
+            if (cresnetBridge != null)
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn", parentKey);
+                return new GlsOdtCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+            }
+            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+            return null;
+        }
+    }
+
 
 
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOirOccupancySensorController.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    public class GlsOirOccupancySensorController:GlsOccupancySensorBaseController
+    {
+        private GlsOirCCn _occSensor;
+
+        public GlsOirOccupancySensorController(string key, Func<DeviceConfig, GlsOirCCn> preActivationFunc,DeviceConfig config) : this(key,config.Name, preActivationFunc, config)
+        {
+        }
+
+        public GlsOirOccupancySensorController(string key, string name, Func<DeviceConfig, GlsOirCCn> preActivationFunc, DeviceConfig config) : base(key, name, config)
+        {
+            AddPreActivationAction(() =>
+            {
+                _occSensor = preActivationFunc(config);
+
+                RegisterCrestronGenericBase(_occSensor);
+
+                RegisterGlsOccupancySensorBaseController(_occSensor);
+            });
+        }
+
+        #region Overrides of CrestronGenericBridgeableBaseDevice
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+        }
+
+        #endregion
+    }
+
+    public class GlsOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<GlsOccupancySensorBaseController>
+    {
+        public GlsOccupancySensorBaseControllerFactory()
+        {
+            TypeNames = new List<string> { "glsoirccn" };
+        }
+
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new GlsOirOccupancySensorController Device");
+
+            return new GlsOirOccupancySensorController(dc.Key, GetGlsOirCCn, dc);
+        }
+
+        private static GlsOirCCn GetGlsOirCCn(DeviceConfig dc)
+        {
+            var control = CommFactory.GetControlPropertiesConfig(dc);
+            var cresnetId = control.CresnetIdInt;
+            var branchId = control.ControlPortNumber;
+            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
+
+            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
+                return new GlsOirCCn(cresnetId, Global.ControlSystem);
+            }
+            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
+
+            if (cresnetBridge != null)
+            {
+                Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
+                return new GlsOirCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+            }
+            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+            return null;
+        }
+
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -229,6 +229,7 @@
     <Compile Include="Interfaces\ILogStrings.cs" />
     <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
     <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
+    <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />