From 8cd9deed5c77c9870082f90a32a80cf44b5bf4a2 Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Sat, 5 May 2018 12:50:13 +0800 Subject: [PATCH] component/esp32 : improve wifi and bluetooth coexistence performance 1. update coexistence and wifi libraries. Coexist version update to v0.9.2 2. Cancel the restriction of use AMPDU when SW_COEXIST_ENABLE is y. --- components/esp32/Kconfig | 14 ++++---------- components/esp32/lib | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig index 3c1266722..c820ba702 100644 --- a/components/esp32/Kconfig +++ b/components/esp32/Kconfig @@ -835,9 +835,9 @@ choice SW_COEXIST_PREFERENCE default SW_COEXIST_PREFERENCE_BALANCE help Choose Bluetooth/WiFi/Balance for different preference. - If choose WiFi, it will make WiFi performance better. Such, keep WiFi Audio more smooth. - If choose Bluetooth, it will make Bluetooth performance better. Such, keep Bluetooth(A2DP) Audio more smooth. - If choose Balance, the performance of WiFi and bluetooth will be balance. It's default. + If choose WiFi, it will make WiFi performance better. Such, keep WiFi Audio more fluent. + If choose Bluetooth, it will make Bluetooth performance better. Such, keep Bluetooth(A2DP) Audio more fluent. + If choose Balance, the performance of WiFi and bluetooth will be balance. It's default. Normally, just choose balance, the A2DP audio can play fluently, too. Except config preference in menuconfig, you can also call esp_coex_preference_set() dynamically. config SW_COEXIST_PREFERENCE_WIFI @@ -948,33 +948,27 @@ config ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM config ESP32_WIFI_AMPDU_TX_ENABLED bool "WiFi AMPDU TX" - default y if SW_COEXIST_ENABLE default y help Select this option to enable AMPDU TX feature - Suggest enable it when SW_COEXIST_ENABLE is defined. config ESP32_WIFI_TX_BA_WIN int "WiFi AMPDU TX BA window size" depends on ESP32_WIFI_AMPDU_TX_ENABLED range 2 32 - default 2 if SW_COEXIST_ENABLE default 6 help Set the size of WiFi Block Ack TX window. Generally a bigger value means higher throughput but more memory. Most of time we should NOT change the default value unless special reason, e.g. test the maximum UDP TX throughput with iperf etc. For iperf test in shieldbox, the recommended - value is 9~12. If SW_COEXIST_ENABLE is defined, suggest value is 2. + value is 9~12. config ESP32_WIFI_AMPDU_RX_ENABLED bool "WiFi AMPDU RX" - depends on !SW_COEXIST_ENABLE - default y default y help Select this option to enable AMPDU RX feature - Suggest disable this option when SW_COEXIST_ENABLE is enabled. It can improve WiFi RX performance normally. config ESP32_WIFI_RX_BA_WIN int "WiFi AMPDU RX BA window size" diff --git a/components/esp32/lib b/components/esp32/lib index e21cf48e2..f46327a4c 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit e21cf48e265f86878d89e31457eb0f1722b410d8 +Subproject commit f46327a4c68b1e4e6a3fb3febd3ba3312df16ff1