Skip to content

Commit ed61b22

Browse files
committed
Merge branch 'bugfix/fix_ble_init_fail' into 'master'
fix(blufi): Fixed blufi init fail after deinit Closes IDFGH-14085 See merge request espressif/esp-idf!35034
2 parents 85fe245 + 7addb57 commit ed61b22

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

components/bt/controller/esp32/bt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,8 @@ static esp_err_t esp_bt_controller_rom_mem_release(esp_bt_mode_t mode)
13451345

13461346
//already released
13471347
if (!(mode & btdm_dram_available_region[0].mode)) {
1348-
return ESP_ERR_INVALID_STATE;
1348+
ESP_LOGW(BTDM_LOG_TAG, "%s already released, mode %d",__func__, mode);
1349+
return ESP_OK;
13491350
}
13501351

13511352
for (int i = 0; i < sizeof(btdm_dram_available_region)/sizeof(btdm_dram_available_region_t); i++) {

examples/bluetooth/blufi/main/blufi_example_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Unlicense OR CC0-1.0
55
*/
@@ -313,15 +313,15 @@ static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_para
313313
ESP_ERROR_CHECK( esp_wifi_set_mode(param->wifi_mode.op_mode) );
314314
break;
315315
case ESP_BLUFI_EVENT_REQ_CONNECT_TO_AP:
316-
BLUFI_INFO("BLUFI requset wifi connect to AP\n");
316+
BLUFI_INFO("BLUFI request wifi connect to AP\n");
317317
/* there is no wifi callback when the device has already connected to this wifi
318318
so disconnect wifi before connection.
319319
*/
320320
esp_wifi_disconnect();
321321
example_wifi_connect();
322322
break;
323323
case ESP_BLUFI_EVENT_REQ_DISCONNECT_FROM_AP:
324-
BLUFI_INFO("BLUFI requset wifi disconnect from AP\n");
324+
BLUFI_INFO("BLUFI request wifi disconnect from AP\n");
325325
esp_wifi_disconnect();
326326
break;
327327
case ESP_BLUFI_EVENT_REPORT_ERROR:

0 commit comments

Comments
 (0)