Merge branch 'bugfix/fix_ble_tx_2m_problem_causing_by_phy_wifi_enable…

…_set_v5.1' into 'release/v5.1' fix(esp_phy): Fixed BLE TX 2M problem causing by phy_wifi_enable_set() (backport v5.1) See merge request espressif/esp-idf!28679
espressif · Jan 29, 2024 · 7cbee80 · 7cbee80
2 parents 0b28bdb + 4529a6a
commit 7cbee80
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/components/esp_phy/lib b/components/esp_phy/lib
diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
@@ -781,11 +781,7 @@ void esp_phy_load_cal_and_init(void)
     // Set PHY whether in combo module
     // For comode mode, phy enable will be not in WiFi RX state
 #if SOC_PHY_COMBO_MODULE
-#if (CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3)
-    phy_init_param_set(0);
-#else
     phy_init_param_set(1);
-#endif
 #endif
 
     esp_phy_calibration_data_t* cal_data =
+ −		esp32c2/libbtbb.a
+ −		esp32c2/libbttestmode.a
+ −		esp32c2/libphy.a
+ −		esp32c2/librftest.a
+ −		esp32c3/libbtbb.a
+ −		esp32c3/libbttestmode.a
+ −		esp32c3/libphy.a
+ −		esp32c3/librfate.a
+ −		esp32c3/librftest.a
+ −		esp32c6/libbtbb.a
+ −		esp32c6/libbttestmode.a
+ −		esp32c6/libphy.a
+ −		esp32c6/librftest.a
+ −		esp32s3/libbtbb.a
+ −		esp32s3/libbttestmode.a
+ −		esp32s3/libphy.a
+ −		esp32s3/librftest.a