From ec43749ba42574ec9baa995f8b53eab254cf898c Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 4 Feb 2021 11:01:21 -0700 Subject: [PATCH] Tested working with GLS-ODT-C-CN hardware --- .../Occupancy/GlsOccupancySensorBaseController.cs | 14 +++++++++++++- .../Occupancy/GlsOdtOccupancySensorController.cs | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs index 711197a5..c788f293 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs @@ -95,9 +95,21 @@ namespace PepperDash.Essentials.Core }); } - public GlsOccupancySensorBaseController(string key, string name) + public GlsOccupancySensorBaseController(string key, string name, DeviceConfig config) : base(key, name) { + + var props = config.Properties.ToObject(); + + if (props != null) + { + PropertiesConfig = props; + } + else + { + Debug.Console(1, this, "props are null. Unable to deserialize into GlsOccupancySensorPropertiesConfig"); + } + AddPostActivationAction(() => { OccSensor.OnlineStatusChange += (o, a) => diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs index e1b82bac..e19c9ba7 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs @@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core public GlsOdtOccupancySensorController(string key, Func preActivationFunc, DeviceConfig config) - : base(key, config.Name) + : base(key, config.Name, config) { AddPreActivationAction(() => {