Merge branch 'bugfix/coex_fix_wifi_scan_and_connect_bugs_v4.0' into 'release/v4.0'

esp_wifi: fix WiFi scan and connect bugs when coexist with Bluetooth

See merge request espressif/esp-idf!6939
pull/4653/head
Jiang Jiang Jian 2019-12-09 13:43:46 +08:00
commit 87c30adfed
3 zmienionych plików z 11 dodań i 1 usunięć

Wyświetl plik

@ -423,6 +423,7 @@ void start_cpu0_default(void)
#if CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE
esp_coex_adapter_register(&g_coex_adapter_funcs);
coex_pre_init();
#endif
bootloader_flash_update_id();

Wyświetl plik

@ -31,6 +31,15 @@ typedef enum {
typedef void (* coex_func_cb_t)(uint32_t event, int sched_cnt);
/**
* @brief Pre-Init software coexist
* extern function for internal use.
*
* @return Init ok or failed.
*/
esp_err_t coex_pre_init(void);
/**
* @brief Init software coexist
* extern function for internal use.

@ -1 +1 @@
Subproject commit dff38c7da07177f5b331d5ab99116ce35e41cc7a
Subproject commit 59850619a807168777a3a3f932e78e74f5a790d0