From 6d2d1d7a0d84bd7b1e411345919d7373f8fc534b Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Wed, 21 Jan 2026 21:24:20 -0500 Subject: [PATCH] Update NimBLE for ESP32-C5 --- .github/workflows/build_parallel.yml | 2 +- esp32_marauder/CommandLine.cpp | 170 ++++++++++++++------------- esp32_marauder/WiFiScan.cpp | 4 +- 3 files changed, 92 insertions(+), 84 deletions(-) diff --git a/.github/workflows/build_parallel.yml b/.github/workflows/build_parallel.yml index a424f2f..7520b82 100644 --- a/.github/workflows/build_parallel.yml +++ b/.github/workflows/build_parallel.yml @@ -35,7 +35,7 @@ jobs: - { name: "Marauder CYD 2432S028 2 USB", flag: "MARAUDER_CYD_2USB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028_2usb", tft: true, tft_file: "User_Setup_cyd_2usb.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Marauder CYD 3.5inch", flag: "MARAUDER_CYD_3_5_INCH", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_3_5_inch", tft: true, tft_file: "User_Setup_cyd_3_5_inch.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "M5Cardputer", flag: "MARAUDER_CARDPUTER", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled", file_name: "m5cardputer", tft: true, tft_file: "User_Setup_marauder_m5cardputer.h", build_dir: "esp32s3", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "ESP32-C5-DevKitC-1", flag: "MARAUDER_C5", fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "esp32c5devkitc1", tft: false, tft_file: "", build_dir: "esp32c5", addr: "0x2000", idf_ver: "3.3.4", nimble_ver: "2.3.6", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "ESP32-C5-DevKitC-1", flag: "MARAUDER_C5", fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "esp32c5devkitc1", tft: false, tft_file: "", build_dir: "esp32c5", addr: "0x2000", idf_ver: "3.3.4", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } steps: - name: Checkout Code diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp index df0c61b..9861222 100644 --- a/esp32_marauder/CommandLine.cpp +++ b/esp32_marauder/CommandLine.cpp @@ -599,7 +599,8 @@ void CommandLine::runCommand(String input) { wifi_scan_obj.StartScan(WIFI_SCAN_STATION_WAR_DRIVE, TFT_GREEN); } else { - Serial.println("Starting Wardrive. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Wardrive. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -630,7 +631,10 @@ void CommandLine::runCommand(String input) { } if (evil_portal_obj.setAP(probe_req_ssids->get(pr_index).essid)) { - Serial.println("Starting Karma Attack with " + probe_req_ssids->get(pr_index).essid + ". Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Karma Attack with ")); + Serial.print(probe_req_ssids->get(pr_index).essid); + Serial.print(F(". Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -652,7 +656,8 @@ void CommandLine::runCommand(String input) { if (cmd_sw != -1) { String et_command = cmd_args.get(cmd_sw + 1); if (et_command == "start") { - Serial.println("Starting Evil Portal. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Evil Portal. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -661,7 +666,8 @@ void CommandLine::runCommand(String input) { String target_html_name = cmd_args.get(html_sw + 1); evil_portal_obj.target_html_name = target_html_name; evil_portal_obj.using_serial_html = false; - Serial.println("Set html file as " + evil_portal_obj.target_html_name); + Serial.print(F("Set html file as ")); + Serial.println(evil_portal_obj.target_html_name); } //else { // evil_portal_obj.target_html_name = "index.html"; @@ -678,7 +684,8 @@ void CommandLine::runCommand(String input) { String target_html_name = cmd_args.get(cmd_sw + 2); evil_portal_obj.target_html_name = target_html_name; evil_portal_obj.using_serial_html = false; - Serial.println("Set html file as " + evil_portal_obj.target_html_name); + Serial.print(F("Set html file as ")); + Serial.println(evil_portal_obj.target_html_name); } else if (et_command == "sethtmlstr") { evil_portal_obj.setHtmlFromSerial(); @@ -697,7 +704,8 @@ void CommandLine::runCommand(String input) { } } else if (cmd_args.get(0) == SCAN_ALL_CMD) { - Serial.println("Scanning for APs and Stations. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Scanning for APs and Stations. Stop with ")); + Serial.println(STOPSCAN_CMD); wifi_scan_obj.StartScan(WIFI_SCAN_AP_STA, TFT_MAGENTA); } else if (cmd_args.get(0) == SCANAP_CMD) { @@ -708,17 +716,20 @@ void CommandLine::runCommand(String input) { #endif if (full_sw == -1) { - Serial.println("Starting AP scan. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting AP scan. Stop with ")); + Serial.println(STOPSCAN_CMD); wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP, TFT_MAGENTA); } else { - Serial.println("Starting Full AP scan. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Full AP scan. Stop with ")); + Serial.println(STOPSCAN_CMD); wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP_FULL, TFT_MAGENTA); } } // Raw sniff else if (cmd_args.get(0) == SNIFF_RAW_CMD) { - Serial.println("Starting Raw sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Raw sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -728,9 +739,11 @@ void CommandLine::runCommand(String input) { // Scan stations else if (cmd_args.get(0) == SCANSTA_CMD) { if(access_points->size() < 1) - Serial.println("The AP list is empty. Scan APs first with " + (String)SCANAP_CMD); + Serial.print(F("The AP list is empty. Scan APs first with ")); + Serial.println(SCANAP_CMD); - Serial.println("Starting Station scan. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Station scan. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -739,7 +752,8 @@ void CommandLine::runCommand(String input) { } // Beacon sniff else if (cmd_args.get(0) == SNIFF_BEACON_CMD) { - Serial.println("Starting Beacon sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Beacon sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -748,7 +762,8 @@ void CommandLine::runCommand(String input) { } // SAE sniff else if (cmd_args.get(0) == SNIFF_SAE_CMD) { - Serial.println("Starting SAE Commit sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting SAE Commit sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -757,7 +772,8 @@ void CommandLine::runCommand(String input) { } // Probe sniff else if (cmd_args.get(0) == SNIFF_PROBE_CMD) { - Serial.println("Starting Probe sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Probe sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -766,7 +782,8 @@ void CommandLine::runCommand(String input) { } // Deauth sniff else if (cmd_args.get(0) == SNIFF_DEAUTH_CMD) { - Serial.println("Starting Deauth sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Deauth sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -775,7 +792,8 @@ void CommandLine::runCommand(String input) { } // Pwn sniff else if (cmd_args.get(0) == SNIFF_PWN_CMD) { - Serial.println("Starting Pwnagotchi sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Pwnagotchi sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -784,7 +802,8 @@ void CommandLine::runCommand(String input) { } // PineScan sniff else if (cmd_args.get(0) == SNIFF_PINESCAN_CMD) { - Serial.println("Starting Pinescan sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Pinescan sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -793,7 +812,8 @@ void CommandLine::runCommand(String input) { } // MultiSSID sniff else if (cmd_args.get(0) == SNIFF_MULTISSID_CMD) { - Serial.println("Starting MultiSSID sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting MultiSSID sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -802,7 +822,8 @@ void CommandLine::runCommand(String input) { } // Espressif sniff else if (cmd_args.get(0) == SNIFF_ESP_CMD) { - Serial.println("Starting Espressif device sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Espressif device sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -844,7 +865,8 @@ void CommandLine::runCommand(String input) { } // MAC Tracking else if (cmd_args.get(0) == MAC_TRACK_CMD) { - Serial.println("Starting MAC Tracker. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting MAC Tracker. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1097,7 +1119,8 @@ void CommandLine::runCommand(String input) { wifi_scan_obj.StartScan(WIFI_ATTACK_RICK_ROLL, TFT_YELLOW); } else if (attack_type == ATTACK_TYPE_FUNNY) { - Serial.println("Starting Funny SSID Beacon spam. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Funny SSID Beacon spam. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1105,7 +1128,8 @@ void CommandLine::runCommand(String input) { wifi_scan_obj.StartScan(WIFI_ATTACK_FUNNY_BEACON, TFT_CYAN); } else if (attack_type == ATTACK_TYPE_SAE) { - Serial.println("Starting SAE Commit spam. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting SAE Commit spam. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1133,7 +1157,8 @@ void CommandLine::runCommand(String input) { // Airtag sniff if (bt_type == "airtag") { - Serial.println("Starting Airtag sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Airtag sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1141,7 +1166,8 @@ void CommandLine::runCommand(String input) { wifi_scan_obj.StartScan(BT_SCAN_AIRTAG, TFT_WHITE); } else if (bt_type == "flipper") { - Serial.println("Starting Flipper sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Flipper sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1149,7 +1175,8 @@ void CommandLine::runCommand(String input) { wifi_scan_obj.StartScan(BT_SCAN_FLIPPER, TFT_ORANGE); } else if (bt_type == "flock") { - Serial.println("Starting Flock sniff. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Flock sniff. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1159,7 +1186,8 @@ void CommandLine::runCommand(String input) { } // General bluetooth sniff else { - Serial.println("Starting Bluetooth scan. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Bluetooth scan. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1184,7 +1212,8 @@ void CommandLine::runCommand(String input) { at.selected = false; airtags->set(i, at); } - Serial.println("Spoofing Airtag: " + airtags->get(target_mac).mac); + Serial.print(F("Spoofing Airtag: ")); + Serial.println(airtags->get(target_mac).mac); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1192,7 +1221,8 @@ void CommandLine::runCommand(String input) { wifi_scan_obj.StartScan(BT_SPOOF_AIRTAG, TFT_WHITE); } else { - Serial.println("Provided index is out of range: " + (String)target_mac); + Serial.print(F("Provided index is out of range: ")); + Serial.println(target_mac); return; } #endif @@ -1205,7 +1235,8 @@ void CommandLine::runCommand(String input) { if (bt_type == "apple") { #ifdef HAS_BT - Serial.println("Starting Sour Apple attack. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Sour Apple attack. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1217,7 +1248,8 @@ void CommandLine::runCommand(String input) { } else if (bt_type == "windows") { #ifdef HAS_BT - Serial.println("Starting Swiftpair Spam attack. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Swiftpair Spam attack. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1229,7 +1261,8 @@ void CommandLine::runCommand(String input) { } else if (bt_type == "samsung") { #ifdef HAS_BT - Serial.println("Starting Samsung Spam attack. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Samsung Spam attack. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1241,7 +1274,8 @@ void CommandLine::runCommand(String input) { } else if (bt_type == "google") { #ifdef HAS_BT - Serial.println("Starting Google Spam attack. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Google Spam attack. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1253,7 +1287,8 @@ void CommandLine::runCommand(String input) { } else if (bt_type == "flipper") { #ifdef HAS_BT - Serial.println("Starting Flipper Spam attack. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Flipper Spam attack. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1265,7 +1300,8 @@ void CommandLine::runCommand(String input) { } else if (bt_type == "all") { #ifdef HAS_BT - Serial.println("Starting BT Spam All attack. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting BT Spam All attack. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1286,7 +1322,8 @@ void CommandLine::runCommand(String input) { #ifdef HAS_GPS if (gps_obj.getGpsModuleStatus()) { - Serial.println("Starting BT Wardrive. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting BT Wardrive. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1306,7 +1343,8 @@ void CommandLine::runCommand(String input) { // Bluetooth CC Skimmer scan else if (cmd_args.get(0) == BT_SKIM_CMD) { #ifdef HAS_BT - Serial.println("Starting Bluetooth CC Skimmer scan. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Bluetooth CC Skimmer scan. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1351,7 +1389,8 @@ void CommandLine::runCommand(String input) { if (wifi_scan_obj.wifi_connected) { // Ping Scan if (cmd_args.get(0) == PING_CMD) { - Serial.println("Starting Ping Scan. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting Ping Scan. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1361,7 +1400,8 @@ void CommandLine::runCommand(String input) { if (cmd_args.get(0) == ARP_SCAN_CMD) { #ifndef HAS_DUAL_BAND - Serial.println("Starting ARP Scan. Stop with " + (String)STOPSCAN_CMD); + Serial.print(F("Starting ARP Scan. Stop with ")); + Serial.println(STOPSCAN_CMD); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1469,7 +1509,8 @@ void CommandLine::runCommand(String input) { target_mode = WIFI_SCAN_RDP; if (target_mode != 0) { - Serial.println("Starting port scan for service " + port_name); + Serial.print(F("Starting port scan for service ")); + Serial.println(port_name); #ifdef HAS_SCREEN display_obj.clearScreen(); menu_function_obj.drawStatusBar(); @@ -1546,7 +1587,7 @@ void CommandLine::runCommand(String input) { if (stations->get(access_points->get(x).stations->get(i)).selected) { Serial.print(" [" + (String)access_points->get(x).stations->get(i) + "] "); Serial.print(sta_mac); - Serial.println(" (selected)"); + Serial.println(F(" (selected)")); count_selected += 1; } else { @@ -1667,7 +1708,8 @@ void CommandLine::runCommand(String input) { for (int i = 0; i < ap_index.size(); i++) { int index = ap_index.get(i).toInt(); if (!this->inRange(access_points->size(), index)) { - Serial.println("Index not in range: " + (String)index); + Serial.print(F("Index not in range: ")); + Serial.println(index); continue; } if (access_points->get(index).selected) { @@ -1718,7 +1760,8 @@ void CommandLine::runCommand(String input) { for (int i = 0; i < sta_index.size(); i++) { int index = sta_index.get(i).toInt(); if (!this->inRange(stations->size(), index)) { - Serial.println("Index not in range: " + (String)index); + Serial.print(F("Index not in range: ")); + Serial.println(index); continue; } if (stations->get(index).selected) { @@ -1766,7 +1809,8 @@ void CommandLine::runCommand(String input) { for (int i = 0; i < ss_index.size(); i++) { int index = ss_index.get(i).toInt(); if (!this->inRange(ssids->size(), index)) { - Serial.println("Index not in range: " + (String)index); + Serial.print(F("Index not in range: ")); + Serial.println(index); continue; } if (ssids->get(index).selected) { @@ -1852,7 +1896,8 @@ void CommandLine::runCommand(String input) { else if (rem_sw != -1) { int index = cmd_args.get(rem_sw + 1).toInt(); if (!this->inRange(ssids->size(), index)) { - Serial.println("Index not in range: " + (String)index); + Serial.print(F("Index not in range: ")); + Serial.println(index); return; } ssids->remove(index); @@ -1862,41 +1907,4 @@ void CommandLine::runCommand(String input) { return; } } - // Join WiFi - /*else if (cmd_args.get(0) == JOINWIFI_CMD) { - int n_sw = this->argSearch(&cmd_args, "-n"); // name - int a_sw = this->argSearch(&cmd_args, "-a"); // access point - int s_sw = this->argSearch(&cmd_args, "-s"); // ssid - int p_sw = this->argSearch(&cmd_args, "-p"); - - String essid = ""; - String pwx = ""; - - if (s_sw != -1) { - int index = cmd_args.get(s_sw + 1).toInt(); - if (!this->inRange(ssids->size(), index)) { - Serial.println("Index not in range: " + (String)index); - return; - } - essid = ssids->get(index).essid; - } else if (a_sw != -1) { - int index = cmd_args.get(a_sw + 1).toInt(); - if (!this->inRange(access_points->size(), index)) { - Serial.println("Index not in range: " + (String)index); - return; - } - essid = access_points->get(index).essid; - } else if (n_sw != -1) { - essid = cmd_args.get(n_sw + 1); - } else { - Serial.println("You must specify an access point or ssid"); - return; - } - - if (p_sw != -1) { - pwx = cmd_args.get(p_sw + 1); - } - Serial.println("Attempting to join WiFi with ssid " + (String)essid); - wifi_scan_obj.joinWiFi(essid, pwx); - }*/ } diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 2d67cb0..145063a 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -2329,9 +2329,9 @@ bool WiFiScan::shutdownBLE() { pBLEScan->clearResults(); - #ifndef HAS_DUAL_BAND + //#ifndef HAS_DUAL_BAND NimBLEDevice::deinit(); - #endif + //#endif this->_analyzer_value = 0; this->bt_frames = 0;