From c4fdf9628a389e1bde7a23a6a351c01e7bbed20b Mon Sep 17 00:00:00 2001 From: Florian <1technophile@users.noreply.github.com> Date: Tue, 28 Feb 2023 07:29:30 -0600 Subject: [PATCH] [BT] Adaptive scan sequence change When reactivating adaptive scan, restore default --- main/ZgatewayBT.ino | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino index f531cfce88..2d73fe0340 100644 --- a/main/ZgatewayBT.ino +++ b/main/ZgatewayBT.ino @@ -152,9 +152,14 @@ void BTConfig_fromJson(JsonObject& BTdata, bool startup = false) { // Attempts to connect to eligible devices or not BTConfig_update(BTdata, "bleconnect", BTConfig.bleConnect); // Identify AdaptiveScan deactivation to pass to continuous mode - if (BTdata.containsKey("adaptivescan") && BTdata["adaptivescan"] == false && BTConfig.adaptiveScan == true && startup == false) { - BTdata["interval"] = MinTimeBtwScan; - BTdata["intervalacts"] = MinTimeBtwScan; + if (startup == false) { + if (BTdata.containsKey("adaptivescan") && BTdata["adaptivescan"] == false && BTConfig.adaptiveScan == true) { + BTdata["interval"] = MinTimeBtwScan; + BTdata["intervalacts"] = MinTimeBtwScan; + } else if (BTdata.containsKey("adaptivescan") && BTdata["adaptivescan"] == true && BTConfig.adaptiveScan == false) { + BTdata["interval"] = TimeBtwRead; + BTdata["intervalacts"] = TimeBtwActive; + } } BTConfig_update(BTdata, "adaptivescan", BTConfig.adaptiveScan); // Time before before active scan