From 5d8fba14c18d4737bdbd4dab7f4ca545da06bc46 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Sun, 23 Mar 2025 21:00:48 -0400 Subject: [PATCH] Less memory initializing wifi for scans --- esp32_marauder/WiFiScan.cpp | 6 ++++-- esp32_marauder/WiFiScan.h | 27 +++++++++++++++++++++++++++ esp32_marauder/configs.h | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 1524bf0..a535b08 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -1559,7 +1559,8 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) delete access_points; access_points = new LinkedList(); - esp_wifi_init(&cfg); + //esp_wifi_init(&cfg); + esp_wifi_init(&cfg2); esp_wifi_set_storage(WIFI_STORAGE_RAM); esp_wifi_set_mode(WIFI_MODE_NULL); esp_wifi_start(); @@ -2533,7 +2534,8 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA); #endif - esp_wifi_init(&cfg); + //esp_wifi_init(&cfg); + esp_wifi_init(&cfg2); esp_wifi_set_storage(WIFI_STORAGE_RAM); esp_wifi_set_mode(WIFI_MODE_NULL); esp_wifi_start(); diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index 46f1349..3bf4ebb 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -392,6 +392,33 @@ class WiFiScan const String alfa = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789-=[];',./`\\_+{}:\"<>?~|!@#$%^&*()"; wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); + + wifi_init_config_t cfg2 = { \ + .event_handler = &esp_event_send_internal, \ + .osi_funcs = &g_wifi_osi_funcs, \ + .wpa_crypto_funcs = g_wifi_default_wpa_crypto_funcs, \ + .static_rx_buf_num = 6,\ + .dynamic_rx_buf_num = 6,\ + .tx_buf_type = 0,\ + .static_tx_buf_num = 1,\ + .dynamic_tx_buf_num = WIFI_DYNAMIC_TX_BUFFER_NUM,\ + .cache_tx_buf_num = 0,\ + .csi_enable = false,\ + .ampdu_rx_enable = false,\ + .ampdu_tx_enable = false,\ + .amsdu_tx_enable = false,\ + .nvs_enable = false,\ + .nano_enable = WIFI_NANO_FORMAT_ENABLED,\ + .rx_ba_win = 6,\ + .wifi_task_core_id = WIFI_TASK_CORE_ID,\ + .beacon_max_len = 752, \ + .mgmt_sbuf_num = 8, \ + .feature_caps = g_wifi_feature_caps, \ + .sta_disconnected_pm = WIFI_STA_DISCONNECTED_PM_ENABLED, \ + .espnow_max_encrypt_num = 0, \ + .magic = WIFI_INIT_CONFIG_MAGIC\ + }; + wifi_config_t ap_config; String security_int_to_string(int security_type); diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 6e9bf8a..50bc64b 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -13,7 +13,7 @@ //#define MARAUDER_V4 //#define MARAUDER_V6 //#define MARAUDER_V6_1 - #define MARAUDER_V7 + //#define MARAUDER_V7 //#define MARAUDER_KIT //#define GENERIC_ESP32 //#define MARAUDER_FLIPPER