From 6208b93dad6f06c9b72f783751476ddbcb57e4f1 Mon Sep 17 00:00:00 2001 From: Chen Jian Hua Date: Fri, 27 Sep 2024 18:33:34 +0800 Subject: [PATCH 1/2] fix(bt/controller): Fixed the timeout of wake up timer when using RC OSC (cherry picked from commit 873708579c99069d073f3d6c7ba6db154cbf16b9) Co-authored-by: chenjianhua --- components/bt/controller/esp32c3/bt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/esp32c3/bt.c b/components/bt/controller/esp32c3/bt.c index b9b30aa965..2f188922ee 100644 --- a/components/bt/controller/esp32c3/bt.c +++ b/components/bt/controller/esp32c3/bt.c @@ -777,7 +777,8 @@ static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles) // allow a maximum time uncertainty to be about 488ppm(1/2048) at least as clock drift // and set the timer in advance uint32_t uncertainty = (us_to_sleep >> 11); -#if CONFIG_FREERTOS_USE_TICKLESS_IDLE +#if CONFIG_BT_CTRL_MAIN_XTAL_PU_DURING_LIGHT_SLEEP + // recalculate clock drift when Bluetooth using main XTAL during light sleep if (rtc_clk_slow_src_get() == SOC_RTC_SLOW_CLK_SRC_RC_SLOW) { uncertainty = us_to_sleep * BTDM_RTC_SLOW_CLK_RC_DRIFT_PERCENT / 100; } From 4219bb9ea153715fe79b66ccb31201035e9b5061 Mon Sep 17 00:00:00 2001 From: Chen Jian Hua Date: Fri, 27 Sep 2024 18:33:37 +0800 Subject: [PATCH 2/2] fix(bt/controller): Fixed ble get tx power error (cherry picked from commit 4108a5cc4cb96039ed861703dda06f7f3a5969c3) Co-authored-by: chenjianhua --- components/bt/controller/esp32c3/bt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/esp32c3/bt.c b/components/bt/controller/esp32c3/bt.c index 2f188922ee..741f311ada 100644 --- a/components/bt/controller/esp32c3/bt.c +++ b/components/bt/controller/esp32c3/bt.c @@ -1750,7 +1750,7 @@ esp_power_level_t esp_ble_tx_power_get(esp_ble_power_type_t power_type) handle = power_type; } - lvl = (esp_power_level_t)ble_txpwr_get(power_type, handle); + lvl = (esp_power_level_t)ble_txpwr_get(enh_pwr_type, handle); return lvl; }