Adjust bluetooth scan time

redakker · Nov 16, 2023 · a9ce8dc · a9ce8dc
1 parent 59bf0ad
commit a9ce8dc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/src/bluetooth.cpp b/src/bluetooth.cpp
@@ -28,8 +28,7 @@ class BlueTooth: public BLEAdvertisedDeviceCallbacks {
     String command;
     long lastRun = 0;
     long lastClear = 0;
-    long lastSendDeviceData = 0;
-    int scanAfter = BT_DEFAULT_SCAN_INTERVAL;
+    long lastSendDeviceData = 0;    
 
     boolean sendAutoDiscovery = false;
     long lastSendAutoDiscovery = 0;
@@ -81,7 +80,7 @@ class BlueTooth: public BLEAdvertisedDeviceCallbacks {
             // Parse the sting, split by ;
 
             // Auto discovery for Home Assistant is available.
-            // Set it tru if the user enabled it
+            // Set it tre if the user enabled it
             sendAutoDiscovery = (database.getValueAsInt(DB_HA_AUTODISCOVERY) > 0) ? true : false;
             if (sendAutoDiscovery) {
                 autoDiscoveryPrefix = database.getValueAsString(DB_HA_AUTODISCOVERY_PREFIX);
@@ -97,10 +96,10 @@ class BlueTooth: public BLEAdvertisedDeviceCallbacks {
 
         void loop() {
 
-            if (millis() - lastRun > scanAfter) {
+            if (millis() - lastRun > BT_DEFAULT_SCAN_INTERVAL) {
                 // Otherwise makes no sens to scan and sent it over
                 if (networkConnected) {
-                    BLEScanResults foundDevices = pBLEScan->start(5, false);            
+                    BLEScanResults foundDevices = pBLEScan->start(10, false);            
                     pBLEScan->clearResults();   // delete results fromBLEScan buffer to release memory
                     lastRun = millis();
                 }

diff --git a/src/definitions.h b/src/definitions.h
@@ -26,7 +26,7 @@
 #define BT_DEVICE_DATA_INTERVAL 1000*60 // Send the BLE device data time to time
 #define DEVICE_DROP_OUT_COUNT 2 // We won't drop out in the first "not found" state, just decrease this value. Drop out when this is 0
 #define PARSE_CHAR ";"
-#define BT_DEFAULT_SCAN_INTERVAL 2000 // Scan is running after this timeout time to time
+#define BT_DEFAULT_SCAN_INTERVAL 3000 // Scan is running after this timeout time to time
 
 // Webhook
 #define PRESENCE_WILDCARD "{presence}"

diff --git a/src/mqtt.cpp b/src/mqtt.cpp
@@ -199,7 +199,7 @@ class Mqtt {
         }
 
         void sendStatus () {
-            sendMqttMessage(baseTopic, "{\"status\": \"" + statusOn + "\", \"ip\":\"" + this -> deviceIPAddress + "\"}");
+            sendMqttMessage(baseTopic, "{\"status\": \"" + statusOn + "\", \"ip\":\"" + this -> deviceIPAddress + "\"}", true);
         }
 };
 

diff --git a/src/webcontent.h b/src/webcontent.h
@@ -378,7 +378,7 @@ BLEcker
 <a class="button w100" href="/">home</a>
 <a class="button w100" href="/update">update</a>
 <!--<a class="button w100 button-danger" id="reset" href="#">reset</a>-->
-<div class="version" id="version">v1.11 - 134</div>
+<div class="version" id="version">v1.11 - 144</div>
 <div id="footer">
 <div><a href="https://github.com/redakker/blecker" target="_blank">blecker</a></div>
 </div>
@@ -1550,7 +1550,7 @@ BLEcker
 <a class="button w100" href="/">home</a>
 <a class="button w100" href="/update">update</a>
 <!--<a class="button w100 button-danger" id="reset" href="#">reset</a>-->
-<div class="version" id="version">v1.11 - 134</div>
+<div class="version" id="version">v1.11 - 144</div>
 <div id="footer">
 <div><a href="https://github.com/redakker/blecker" target="_blank">blecker</a></div>
 </div>

diff --git a/src/webhook.cpp b/src/webhook.cpp
@@ -11,7 +11,7 @@ class Webhook {
 
     Logger logger;
     Database* database;
-    HTTPClient http;
+    HTTPClient http;    
 
     boolean webhookConfigured = false;
     unsigned long lastrun = 0;
@@ -39,16 +39,18 @@ class Webhook {
 
             if (webhookConfigured) {
                 String baseURL = this->database->getValueAsString(DB_WEBHOOK);
+                baseURL.toLowerCase();
 
                 baseURL.replace(DEVICE_WILDCARD, device.mac);
                 if (device.available) {
                     baseURL.replace(PRESENCE_WILDCARD, getPresentString(*database, true));
                 } else {
                     baseURL.replace(PRESENCE_WILDCARD, getPresentString(*database, false));
                 }
-
-                http.begin(baseURL); //Specify the URL
-                int httpCode = http.GET();                                        //Make the request
+
+                http.begin(baseURL); //Specify the URL               
+
+                int httpCode = http.GET(); //Make the request
 
                 if (httpCode > 0) { //Check for the returning code
-Original file line number
+Diff line change
@@ Expand Up / @@ -199,7 +199,7 @@ class Mqtt { @@
             }
             void sendStatus () {
-                sendMqttMessage(baseTopic, "{\"status\": \"" + statusOn + "\", \"ip\":\"" + this -> deviceIPAddress + "\"}");
+                sendMqttMessage(baseTopic, "{\"status\": \"" + statusOn + "\", \"ip\":\"" + this -> deviceIPAddress + "\"}", true);
             }
     };
@@ Expand Down @@