more reconnect stability improvements

doudar · Mar 5, 2024 · 0e3b8de · 0e3b8de
1 parent 8b8dfb8
commit 0e3b8de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/include/settings.h b/include/settings.h
@@ -294,7 +294,7 @@
 #define DEFAULT_SCAN_DURATION 5
 
 // BLE automatic reconnect duration. Set this low to avoid interruption.
-#define BLE_RECONNECT_SCAN_DURATION 15
+#define BLE_RECONNECT_SCAN_DURATION 5
 
 //Task Stack Sizes
 #define MAIN_STACK 4500

diff --git a/src/BLE_Client.cpp b/src/BLE_Client.cpp
@@ -316,7 +316,7 @@ void MyClientCallback::onConnect(NimBLEClient *pClient) {
 }
 
 void MyClientCallback::onDisconnect(NimBLEClient *pClient) {
-  NimBLEDevice::getScan()->stop();
+ //  NimBLEDevice::getScan()->stop();
   // NimBLEDevice::getScan()->clearResults();
   // NimBLEDevice::getScan()->clearDuplicateCache();
   if (!pClient->isConnected()) {
@@ -338,20 +338,15 @@ void MyClientCallback::onDisconnect(NimBLEClient *pClient) {
             (spinBLEClient.myBLEDevices[i].charUUID == CYCLINGPOWERSERVICE_UUID)) {
           SS2K_LOG(BLE_CLIENT_LOG_TAG, "Deregistered PM on Disconnect");
           rtConfig->pm_batt.setValue(0);
-          spinBLEClient.connectedPM = false;
-          break;
         }
         if ((spinBLEClient.myBLEDevices[i].charUUID == HEARTCHARACTERISTIC_UUID)) {
           SS2K_LOG(BLE_CLIENT_LOG_TAG, "Deregistered HR on Disconnect");
           rtConfig->hr_batt.setValue(0);
-          spinBLEClient.connectedHRM = false;
-          break;
         }
         if ((spinBLEClient.myBLEDevices[i].charUUID == HID_REPORT_DATA_UUID)) {
           SS2K_LOG(BLE_CLIENT_LOG_TAG, "Deregistered Remote on Disconnect");
-          spinBLEClient.connectedRemote = false;
-          break;
         }
+        spinBLEClient.myBLEDevices[i].reset();
       }
     }
     return;
@@ -439,6 +434,8 @@ void SpinBLEClient::scanProcess(int duration) {
   SS2K_LOGW(BLE_CLIENT_LOG_TAG, "Scanning for BLE servers and putting them into a list...");
 
   BLEScan *pBLEScan = BLEDevice::getScan();
+  pBLEScan->clearDuplicateCache();
+  pBLEScan->clearResults();
   pBLEScan->setAdvertisedDeviceCallbacks(&myAdvertisedDeviceCallbacks);
   pBLEScan->setInterval(49);  // 97
   pBLEScan->setWindow(33);    // 67
@@ -480,9 +477,7 @@ void SpinBLEClient::scanProcess(int duration) {
 
   String output;
   serializeJson(devices, output);
-  if (duration > BLE_RECONNECT_SCAN_DURATION) {
     SS2K_LOG(BLE_CLIENT_LOG_TAG, "Bluetooth Client Found Devices: %s", output.c_str());
-  }
 #ifdef USE_TELEGRAM
   SEND_TO_TELEGRAM("Bluetooth Client Found Devices: " + output);
 #endif

diff --git a/src/BLE_Common.cpp b/src/BLE_Common.cpp
@@ -21,9 +21,9 @@ TaskHandle_t BLECommunicationTask;
 
 void BLECommunications(void *pvParameters) {
   for (;;) {
-    if (!spinBLEClient.dontBlockScan) {
-      NimBLEDevice::getScan()->stop();  // stop routine scans
-    }
+   // if (!spinBLEClient.dontBlockScan) {
+   //   NimBLEDevice::getScan()->stop();  // stop routine scans
+   // }
     // **********************************Client***************************************
     for (size_t x = 0; x < NUM_BLE_DEVICES; x++) {  // loop through discovered devices
       if (spinBLEClient.myBLEDevices[x].connectedClientID != BLE_HS_CONN_HANDLE_NONE) {
@@ -68,12 +68,12 @@ void BLECommunications(void *pvParameters) {
 
               } else if (!pClient->isConnected()) {  // This shouldn't ever be
                                                      // called...
-                if (pClient->disconnect() == 0) {    // 0 is a successful disconnect
-                  BLEDevice::deleteClient(pClient);
-                  vTaskDelay(100 / portTICK_PERIOD_MS);
-                  SS2K_LOG(BLE_COMMON_LOG_TAG, "Workaround connect");
-                  myAdvertisedDevice.doConnect = true;
-                }
+                                                     // if (pClient->disconnect() == 0) {    // 0 is a successful disconnect
+                // BLEDevice::deleteClient(pClient);
+                // vTaskDelay(100 / portTICK_PERIOD_MS);
+                SS2K_LOG(BLE_COMMON_LOG_TAG, "Workaround connect");
+                myAdvertisedDevice.doConnect = true;
+                //}
               }
             }
           }