From 5c3f1e058d00b229f62fc25c0fc875b2094a4291 Mon Sep 17 00:00:00 2001 From: Zhang Jun Hao Date: Tue, 12 Nov 2019 16:19:23 +0800 Subject: [PATCH] feat(lib): set the connection to the open router mechanism when pwd is set --- components/esp8266/Kconfig | 7 +++++++ components/esp8266/lib/VERSION | 2 +- components/esp8266/lib/libcore.a | Bin 91754 -> 91906 bytes components/esp8266/lib/libcore_dbg.a | Bin 93022 -> 93174 bytes components/esp8266/source/esp_wifi.c | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/components/esp8266/Kconfig b/components/esp8266/Kconfig index 7cb28eee..8fdd15d9 100644 --- a/components/esp8266/Kconfig +++ b/components/esp8266/Kconfig @@ -419,6 +419,13 @@ config ESP8266_WIFI_NVS_ENABLED help Select this option to enable WiFi NVS flash +config ESP8266_WIFI_CONNECT_OPEN_ROUTER_WHEN_PWD_IS_SET + bool "Connent open router when wifi password is set" + default y + help + When this option is enabled, ESP8266 will connect to open router even if wifi password is set, otherwise + ESP8266 will not connect to open router when wifi password is set. + config ESP8266_WIFI_DEBUG_LOG_ENABLE bool "Enable WiFi debug log" default n diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION index 8875e570..0af06037 100644 --- a/components/esp8266/lib/VERSION +++ b/components/esp8266/lib/VERSION @@ -1,5 +1,5 @@ gwen: - core: 743c778 + core: 158ee68 net80211: 72ecd98 pp: 5b48c0d wpa: 743c778 diff --git a/components/esp8266/lib/libcore.a b/components/esp8266/lib/libcore.a index f72828557c53e2c5585dcaf4ef975f5504fbd7e5..96af2578da8bdf1cd062c23ef3b88fa3ff8ceecc 100644 GIT binary patch delta 5319 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 diff --git a/components/esp8266/lib/libcore_dbg.a b/components/esp8266/lib/libcore_dbg.a index ce9966d463e3e5b2cefaeb25e49e063032161c7c..3be2a7328d87dd143aa50c144bf746eb74e75f45 100644 GIT binary patch delta 5022 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 diff --git a/components/esp8266/source/esp_wifi.c b/components/esp8266/source/esp_wifi.c index 810bc168..03787876 100644 --- a/components/esp8266/source/esp_wifi.c +++ b/components/esp8266/source/esp_wifi.c @@ -20,6 +20,7 @@ #include "phy.h" const size_t _g_esp_wifi_ppt_task_stk_size = CONFIG_WIFI_PPT_TASKSTACK_SIZE; +const bool _g_esp_wifi_connect_open_router_when_pwd_is_set = CONFIG_ESP8266_WIFI_CONNECT_OPEN_ROUTER_WHEN_PWD_IS_SET; esp_err_t esp_wifi_init_internal(const wifi_init_config_t *config);