Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fix_ble_rtc_register_issue_after_reset' into 'master'

Browse Source 
fix(ble): fix ble rtc reset issues on esp32-h4 and esp32-s31

Closes BLERP-2934, BLERP-2935, and BLERP-2937

See merge request espressif/esp-idf!50057
This commit is contained in:
Island
2026-07-01 14:04:41 +08:00
parent 03cf5bb45a 1c17dee316
commit b295d1f227
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/controller/lib_esp32h4/esp32h4-bt-lib
+1 -1
Submodule components/bt/controller/lib_esp32h4/esp32h4-bt-lib updated: 09b1bc34ce...8257501289
components/bt/controller/lib_esp32s31/esp32s31-bt-lib
+1 -1
Submodule components/bt/controller/lib_esp32s31/esp32s31-bt-lib updated: 589a3a2bde...0a0fbbec19
components/bt/porting_btdm/transport/include/esp_hci_driver.h
+31 -2
View File
@@ -106,10 +106,39 @@ extern hci_driver_ops_t hci_driver_vhci_ops;
#endif // UC_BT_CTRL_HCI_INTERFACE_USE_RAM
#if UC_BT_CTRL_HCI_INTERFACE_USE_UART
extern hci_driver_ops_t hci_driver_uart_ops;
#if UC_BT_CTRL_UART_HCI_DMA_MODE
extern hci_driver_ops_t hci_driver_uart_dma_ops;
#endif // UC_BT_CTRL_UART_HCI_DMA_MODE
/**
* @brief Reconfigure the UART pins for the HCI driver.
*
* This function changes the UART pin configuration for the HCI driver.
*
* @param tx_pin The pin number for the UART TX (transmit) line.
* @param rx_pin The pin number for the UART RX (receive) line.
* @param cts_pin The pin number for the UART CTS (clear to send) line.
* @param rts_pin The pin number for the UART RTS (request to send) line.
*
* @return int Returns 0 on success, or a negative error code on failure.
*/
int hci_driver_uart_dma_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
#define hci_uart_reconfig_pin hci_driver_uart_dma_reconfig_pin
#else
extern hci_driver_ops_t hci_driver_uart_ops;
/**
* @brief Reconfigure the UART pins for the HCI driver.
*
* This function changes the UART pin configuration for the HCI driver.
*
* @param tx_pin The pin number for the UART TX (transmit) line.
* @param rx_pin The pin number for the UART RX (receive) line.
* @param cts_pin The pin number for the UART CTS (clear to send) line.
* @param rts_pin The pin number for the UART RTS (request to send) line.
*
* @return int Returns 0 on success, or a negative error code on failure.
*/
int hci_driver_uart_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
#define hci_uart_reconfig_pin hci_driver_uart_reconfig_pin
#endif // CONFIG_BT_LE_UART_HCI_DMA_MODE
#endif // UC_BT_CTRL_HCI_INTERFACE_USE_UART
#endif // H_ESP_HCI_DRIVER_
examples/bluetooth/nimble/power_save/main/main.c
+2 -1
View File
@@ -16,6 +16,7 @@
#include "console/console.h"
#include "services/gap/ble_svc_gap.h"
#include "bleprph.h"
#include "soc/rtc.h"
#if CONFIG_EXAMPLE_EXTENDED_ADV
static uint8_t ext_adv_pattern_1[] = {
@@ -574,7 +575,7 @@ app_main(void)
// automatic light sleep is enabled if tickless idle support is enabled.
esp_pm_config_t pm_config = {
.max_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ,
.min_freq_mhz = CONFIG_XTAL_FREQ,
.min_freq_mhz = rtc_clk_xtal_freq_get(),
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
.light_sleep_enable = true
#endif