alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_ble_recorrect_enable_bug_v4.3' into 'release/v4.3'

Browse Source 
fix(ble/controller): Fixed BLE recorrect enable bug and fixed BLE bb isr enable by default(backport v4.3)

See merge request espressif/esp-idf!28039
This commit is contained in:
Jiang Jiang Jian 2023-12-22 14:38:57 +08:00
commit 2e8d33e1be
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/lib_esp32c3_family

@ -1 +1 @@
Subproject commit d44eff5539470b8cbf1e4a83f0d2eec8798845a4 Subproject commit c6ddd0d4164a8f0b2b244955a6c6691334568262

15
components/bt/include/esp32c3/include/esp_bt.h
View File

@ -137,8 +137,21 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
#ifdef CONFIG_BT_CTRL_AGC_RECORRECT_EN #ifdef CONFIG_BT_CTRL_AGC_RECORRECT_EN
#define BT_CTRL_AGC_RECORRECT_EN CONFIG_BT_CTRL_AGC_RECORRECT_EN #define BT_CTRL_AGC_RECORRECT_EN CONFIG_BT_CTRL_AGC_RECORRECT_EN
// ESP32-S3
#if CONFIG_IDF_TARGET_ESP32S3
#define BT_CTRL_AGC_RECORRECT_NEW 1
#else
//Check if chip target is ESP32-C3 101
#if CONFIG_ESP32C3_REV_MIN_101
#define BT_CTRL_AGC_RECORRECT_NEW 1
#else
#define BT_CTRL_AGC_RECORRECT_NEW 0
#endif // CONFIG_ESP32C3_REV_MIN_101
#endif // CONFIG_IDF_TARGET_ESP32S3
#else #else
#define BT_CTRL_AGC_RECORRECT_EN 0 #define BT_CTRL_AGC_RECORRECT_EN 0
#define BT_CTRL_AGC_RECORRECT_NEW 0
#endif #endif
#ifdef CONFIG_BT_CTRL_CODED_AGC_RECORRECT_EN #ifdef CONFIG_BT_CTRL_CODED_AGC_RECORRECT_EN
@ -168,7 +181,7 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
#define BT_BLE_CCA_MODE (0) #define BT_BLE_CCA_MODE (0)
#endif #endif
#define AGC_RECORRECT_EN ((BT_CTRL_AGC_RECORRECT_EN << 0) | (BT_CTRL_CODED_AGC_RECORRECT <<1)) #define AGC_RECORRECT_EN ((BT_CTRL_AGC_RECORRECT_EN << 0) | (BT_CTRL_CODED_AGC_RECORRECT <<1) | (BT_CTRL_AGC_RECORRECT_NEW << 2))
#ifdef CONFIG_BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX #ifdef CONFIG_BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX
#define BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX CONFIG_BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX #define BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX CONFIG_BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX