From e0dcde5c3581d2ca46abaeff0b3390246f6bd4e3 Mon Sep 17 00:00:00 2001 From: jkdevito Date: Mon, 1 Feb 2021 11:10:33 -0600 Subject: [PATCH] Reviewed with AW, decided best to remove console commands and create a public method that can be called using DEVJSON to print current settiings. --- .../CenOdtOccupancySensorBaseController.cs | 53 +++++++----------- .../GlsOccupancySensorBaseController.cs | 41 +++++--------- .../GlsOdtOccupancySensorController.cs | 54 +++++++------------ 3 files changed, 53 insertions(+), 95 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs index acbd6a4c..6606c1e6 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs @@ -119,12 +119,6 @@ namespace PepperDash.Essentials.Core OccSensor.BaseEvent += new Crestron.SimplSharpPro.BaseEventHandler(OccSensor_BaseEvent); OccSensor.CenOccupancySensorChange += new GenericEventHandler(OccSensor_CenOccupancySensorChange); - - CrestronConsole.AddNewConsoleCommand(GetSettings, - "occsensorstatus", - "Reports current occupancy sensor settings. Requires a device key.", - ConsoleAccessLevelEnum.AccessOperator); - } /// @@ -432,42 +426,33 @@ namespace PepperDash.Essentials.Core } } - private static void GetSettings(string key) + /// + /// Method to print current settings to console + /// + public void GetSettings() { - var dev = DeviceManager.GetDeviceForKey(key); - if (dev == null) return; - - var sensor = dev as CenOdtOccupancySensorBaseController; - if (sensor == null) return; - - if (!sensor.Hardware.IsOnline) - { - Debug.Console(0, sensor.Key, "Sensor IsOnline: {0}", sensor.Hardware.IsOnline); - return; - } - var dash = new string('*', 50); CrestronConsole.PrintLine(string.Format("{0}\n", dash)); - Debug.Console(0, sensor.Key, "Timeout Current: {0} | Remote: {1}", - sensor.CurrentTimeoutFeedback.UShortValue, - sensor.RemoteTimeoutFeedback.UShortValue); + Debug.Console(0, Key, "Timeout Current: {0} | Remote: {1}", + OccSensor.CurrentTimeoutFeedback.UShortValue, + OccSensor.RemoteTimeout.UShortValue); - Debug.Console(0, sensor.Key, "Short Timeout Enabled: {0}", - sensor.ShortTimeoutEnabledFeedback.BoolValue); + Debug.Console(0, Key, "Short Timeout Enabled: {0}", + OccSensor.ShortTimeoutEnabledFeedback.BoolValue); - Debug.Console(0, sensor.Key, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}", - sensor.PirSensorEnabledFeedback.BoolValue, - sensor.PirSensitivityInOccupiedStateFeedback.UShortValue, - sensor.PirSensitivityInVacantStateFeedback.UShortValue); + Debug.Console(0, Key, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}", + OccSensor.PassiveInfraredSensorEnabledFeedback.BoolValue, + OccSensor.PassiveInfraredSensorSensitivityInOccupiedStateFeedback, + OccSensor.PassiveInfraredSensorSensitivityInVacantStateFeedback); - Debug.Console(0, sensor.Key, "Ultrasonic Enabled A: {0} | B: {1}", - sensor.UltrasonicAEnabledFeedback.BoolValue, - sensor.UltrasonicBEnabledFeedback.BoolValue); + Debug.Console(0, Key, "Ultrasonic Enabled A: {0} | B: {1}", + OccSensor.UltrasonicSensorSideAEnabledFeedback.BoolValue, + OccSensor.UltrasonicSensorSideBEnabledFeedback.BoolValue); - Debug.Console(0, sensor.Key, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}", - sensor.UltrasonicSensitivityInOccupiedStateFeedback.UShortValue, - sensor.UltrasonicSensitivityInVacantStateFeedback.UShortValue); + Debug.Console(0, Key, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}", + OccSensor.UltrasonicSensorSensitivityInOccupiedStateFeedback, + OccSensor.UltrasonicSensorSensitivityInVacantStateFeedback); CrestronConsole.PrintLine(string.Format("{0}\n", dash)); } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs index 4fb3510a..de51527c 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs @@ -70,11 +70,6 @@ namespace PepperDash.Essentials.Core RegisterGlsOdtSensorBaseController(OccSensor); }); - - CrestronConsole.AddNewConsoleCommand(GetSettings, - "occsensorstatus", - "Reports current occupancy sensor settings. Requires a device key.", - ConsoleAccessLevelEnum.AccessOperator); } public GlsOccupancySensorBaseController(string key, string name) : base(key, name) { } @@ -298,34 +293,26 @@ namespace PepperDash.Essentials.Core OccSensor.ExternalPhotoSensorMinimumChange.UShortValue = value; } - private static void GetSettings(string key) + /// + /// Method to print current occ settings to console. + /// + /// + public void GetSettings() { - var dev = DeviceManager.GetDeviceForKey(key); - if (dev == null) return; - - var sensor = dev as GlsOccupancySensorBaseController; - if (sensor == null) return; - - if (!sensor.Hardware.IsOnline) - { - Debug.Console(0, sensor.Key, "Sensor IsOnline: {0}", sensor.Hardware.IsOnline); - return; - } - var dash = new string('*', 50); CrestronConsole.PrintLine(string.Format("{0}\n", dash)); - Debug.Console(0, sensor.Key, "Timeout Current: {0} | Local: {1}", - sensor.CurrentTimeoutFeedback.UShortValue, - sensor.LocalTimoutFeedback.UShortValue); + Debug.Console(0, Key, "Timeout Current: {0} | Local: {1}", + OccSensor.CurrentTimeoutFeedback.UShortValue, + OccSensor.LocalTimeoutFeedback.UShortValue); - Debug.Console(0, sensor.Key, "Short Timeout Enabled: {0}", - sensor.ShortTimeoutEnabledFeedback.BoolValue); + Debug.Console(0, Key, "Short Timeout Enabled: {0}", + OccSensor.ShortTimeoutEnabledFeedback.BoolValue); - Debug.Console(0, sensor.Key, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}", - sensor.PirSensorEnabledFeedback.BoolValue, - sensor.PirSensitivityInOccupiedStateFeedback.UShortValue, - sensor.PirSensitivityInVacantStateFeedback.UShortValue); + Debug.Console(0, Key, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}", + OccSensor.PirEnabledFeedback.BoolValue, + OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue, + OccSensor.PirSensitivityInVacantStateFeedback.UShortValue); CrestronConsole.PrintLine(string.Format("{0}\n", dash)); } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs index 1d4e2781..68d4dcb0 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs @@ -63,12 +63,7 @@ namespace PepperDash.Essentials.Core UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue); - }); - - CrestronConsole.AddNewConsoleCommand(GetSettings, - "occsensorstatus", - "Reports current occupancy sensor settings. Requires a device key.", - ConsoleAccessLevelEnum.AccessOperator); + }); } /// @@ -175,42 +170,33 @@ namespace PepperDash.Essentials.Core LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge); } - private static void GetSettings(string key) + /// + /// Method to print occ sensor settings to console. + /// + public void GetSettings() { - var dev = DeviceManager.GetDeviceForKey(key); - if (dev == null) return; - - var sensor = dev as GlsOdtOccupancySensorController; - if (sensor == null) return; - - if (!sensor.Hardware.IsOnline) - { - Debug.Console(0, sensor.Key, "Sensor IsOnline: {0}", sensor.Hardware.IsOnline); - return; - } - var dash = new string('*', 50); CrestronConsole.PrintLine(string.Format("{0}\n", dash)); - Debug.Console(0, sensor.Key, "Timeout Current: {0} | Local: {1}", - sensor.CurrentTimeoutFeedback.UShortValue, - sensor.LocalTimoutFeedback.UShortValue); + Debug.Console(0, Key, "Timeout Current: {0} | Local: {1}", + OccSensor.CurrentTimeoutFeedback.UShortValue, + OccSensor.LocalTimeoutFeedback.UShortValue); - Debug.Console(0, sensor.Key, "Short Timeout Enabled: {0}", - sensor.ShortTimeoutEnabledFeedback.BoolValue); + Debug.Console(0, Key, "Short Timeout Enabled: {0}", + OccSensor.ShortTimeoutEnabledFeedback.BoolValue); - Debug.Console(0, sensor.Key, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}", - sensor.PirSensorEnabledFeedback.BoolValue, - sensor.PirSensitivityInOccupiedStateFeedback.UShortValue, - sensor.PirSensitivityInVacantStateFeedback.UShortValue); + Debug.Console(0, Key, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}", + OccSensor.PirEnabledFeedback.BoolValue, + OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue, + OccSensor.PirSensitivityInVacantStateFeedback.UShortValue); - Debug.Console(0, sensor.Key, "Ultrasonic Enabled A: {0} | B: {1}", - sensor.UltrasonicAEnabledFeedback.BoolValue, - sensor.UltrasonicBEnabledFeedback.BoolValue); + Debug.Console(0, Key, "Ultrasonic Enabled A: {0} | B: {1}", + OccSensor.UsAEnabledFeedback.BoolValue, + OccSensor.UsBEnabledFeedback.BoolValue); - Debug.Console(0, sensor.Key, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}", - sensor.UltrasonicSensitivityInOccupiedStateFeedback.UShortValue, - sensor.UltrasonicSensitivityInVacantStateFeedback.UShortValue); + Debug.Console(0, Key, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}", + OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue, + OccSensor.UsSensitivityInVacantStateFeedback.UShortValue); CrestronConsole.PrintLine(string.Format("{0}\n", dash)); }