From 60bc54c8abdf2cdb4ee7fe0484f1e83792f55829 Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Mon, 30 Jul 2018 15:59:19 +0800 Subject: [PATCH] feat(esp8266): Add function to return max scan AP number --- components/esp8266/Kconfig | 14 ++++++++++++++ components/esp8266/lib/VERSION | 4 ++-- components/esp8266/lib/libnet80211.a | Bin 358294 -> 358586 bytes components/esp8266/source/esp_wifi.c | 8 +++++++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/components/esp8266/Kconfig b/components/esp8266/Kconfig index ffe189d9..d2c9655a 100644 --- a/components/esp8266/Kconfig +++ b/components/esp8266/Kconfig @@ -30,6 +30,20 @@ endchoice endmenu +menu WIFI + +config SCAN_AP_MAX + int "Max scan AP number" + range 1 64 + default 32 + help + Function "esp_wifi_scan_get_ap_num" return value will be less than this. It is said that user cannot + scan more than this. + + User can use own function "esp_wifi_scan_get_ap_num_max" to determin how many AP to scan , too. + +endmenu + menu PHY config ESP_PHY_CALIBRATION_AND_DATA_STORAGE diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION index da83e161..5edb2d12 100644 --- a/components/esp8266/lib/VERSION +++ b/components/esp8266/lib/VERSION @@ -2,9 +2,9 @@ gwen: crypto: 8943c89 espnow: 8943c89 core: 2f2b0ef - net80211: 7ad7dee + net80211: 09abf27 pp: 06e0988 pwm: 0181338 smartconfig:8d61f0e wpa: f59f0e0 - wps: f59f0e0 \ No newline at end of file + wps: f59f0e0 diff --git a/components/esp8266/lib/libnet80211.a b/components/esp8266/lib/libnet80211.a index a3313d3ca8874bae551e5fc31a3c3162aecb407a..21133bb47550a5e388dc76cd4d7c01b326f1b48f 100644 GIT binary patch delta 7043 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 aC~2>>$SyJELW``3Kianq{e@ir;$Hv^Z9uO8 delta 6818 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 BPDcO$ diff --git a/components/esp8266/source/esp_wifi.c b/components/esp8266/source/esp_wifi.c index 47411e4c..cb684e01 100644 --- a/components/esp8266/source/esp_wifi.c +++ b/components/esp8266/source/esp_wifi.c @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "sdkconfig.h" #include "esp_libc.h" #include "esp_system.h" #include "esp_wifi.h" @@ -49,4 +50,9 @@ esp_err_t esp_wifi_init(const wifi_init_config_t *config) void esp_deep_sleep_set_rf_option(uint8_t option) { phy_afterwake_set_rfoption(option); -} \ No newline at end of file +} + +size_t __attribute__((weak)) esp_wifi_scan_get_ap_num_max(void) +{ + return CONFIG_SCAN_AP_MAX; +}