From 14733de81e931dba96cb5b23d8cce58c39bb32c9 Mon Sep 17 00:00:00 2001 From: demostenes Date: Mon, 25 Mar 2019 22:09:24 +0100 Subject: [PATCH] Defined more scanner parameters in settings --- ESP32-mqtt-room.ino | 8 ++++---- Settings.h | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ESP32-mqtt-room.ino b/ESP32-mqtt-room.ino index 4e7dbc8..f6bbca5 100644 --- a/ESP32-mqtt-room.ino +++ b/ESP32-mqtt-room.ino @@ -34,7 +34,7 @@ extern "C" { #include "Settings_a.h" BLEScan* pBLEScan; -int scanTime = 10; //In seconds +int scanTime = singleScanTime; //In seconds int waitTime = scanInterval; //In seconds bool updateInProgress = false; @@ -405,9 +405,9 @@ void setup() { BLEDevice::init(""); pBLEScan = BLEDevice::getScan(); //create new scan pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks()); - pBLEScan->setActiveScan(true); //active scan uses more power, but get results faster - pBLEScan->setInterval(0x80); - pBLEScan->setWindow(0x10); + pBLEScan->setActiveScan(activeScan); + pBLEScan->setInterval(bleScanInterval); + pBLEScan->setWindow(bleScanWindow); xTaskCreatePinnedToCore( scanForDevices, diff --git a/Settings.h b/Settings.h index b45e289..13aaf23 100644 --- a/Settings.h +++ b/Settings.h @@ -36,6 +36,10 @@ // Define bluetooth scan parameters #define scanInterval 2 // Define the interval in seconds between scans +#define singleScanTime 10 // Define the duration of a single scan in seconds +#define activeScan true // Active scan uses more power, but get results faster +#define bleScanInterval 0x80 // (milliseconds) The time interval from when the Controller started its last LE scan until it begins the subsequent LE scan +#define bleScanWindow 0x10 // (milliseconds) The duration of the LE scan, shall be less than or equal to bleScanInterval; if interval and window are equal then perform continuous scan // Maximum distance (in meters) to report. Devices that are calculated to be further than this distance in meters will not be reported #define maxDistance 5