Update NimBLE fix memory leak

justcallmekoko · Nov 23, 2024 · 6fe012a · 6fe012a
1 parent d9dbcc8
commit 6fe012a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -112,7 +112,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: h2zero/NimBLE-Arduino
-          ref: 1.2.0
+          ref: 1.3.5
           path: CustomNimBLE-Arduino
 
       - name: Install Adafruit_NeoPixel

diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
@@ -400,13 +400,13 @@ MenuFunctions::MenuFunctions()
         // Start spoofing airtag
         if (do_that_thang) {
           menu_function_obj.deinitLVGL();
+          lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
           wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
           display_obj.clearScreen();
           menu_function_obj.orientDisplay();
           display_obj.clearScreen();
           menu_function_obj.drawStatusBar();
           wifi_scan_obj.StartScan(BT_SPOOF_AIRTAG, TFT_WHITE);
-          return;
         }
       }
       else {

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
@@ -830,6 +830,7 @@ bool WiFiScan::shutdownWiFi() {
 bool WiFiScan::shutdownBLE() {
   #ifdef HAS_BT
     if (this->ble_initialized) {
+      Serial.println("Shutting down BLE");
       pAdvertising->stop();
       pBLEScan->stop();
 
@@ -2083,12 +2084,8 @@ void WiFiScan::executeSpoofAirtag() {
 
         convertMacStringToUint8(airtags->get(i).mac, macAddr);
 
-        //macAddr[0] = 0x02;
-
         macAddr[5] -= 2;
 
-        Serial.println("Using MAC: " + macToString(macAddr));
-
         // Do this because ESP32 BT addr is Base MAC + 2
 
         this->setBaseMacAddress(macAddr);