espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble): Reset HID service during deinit

Browse Source
This commit is contained in:
Astha Verma
2025-09-08 15:37:45 +05:30
committed by Rahul Tank
parent bf3bd638ab
commit 2a08c85677
5 changed files with 103 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/bluetooth/esp_hid_device/main/esp_hid_gap.c
+83 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@@ -1021,6 +1021,44 @@ static esp_err_t init_low_level(uint8_t mode)
#endif /* CONFIG_BT_BLE_ENABLED */
return ret;
}
static esp_err_t deinit_low_level(void)
{
esp_err_t ret;
if (bt_scan_results) {
esp_hid_scan_results_free(bt_scan_results);
bt_scan_results = NULL;
num_bt_scan_results = 0;
}
if (ble_scan_results) {
esp_hid_scan_results_free(ble_scan_results);
ble_scan_results = NULL;
num_ble_scan_results = 0;
}
ret = esp_bluedroid_disable();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "esp_bluedroid_disable failed: %d", ret);
}
ret = esp_bluedroid_deinit();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "esp_bluedroid_deinit failed: %d", ret);
}
ret = esp_bt_controller_disable();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "esp_bt_controller_disable failed: %d", ret);
}
ret = esp_bt_controller_deinit();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "esp_bt_controller_deinit failed: %d", ret);
}
return ret;
}
#endif
#if CONFIG_BT_NIMBLE_ENABLED
@@ -1055,10 +1093,54 @@ static esp_err_t init_low_level(uint8_t mode)
}
return ret;
}
static esp_err_t deinit_low_level(void)
{
esp_err_t ret;
ret = esp_nimble_deinit();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "esp_nimble_deinit failed: %d", ret);
}
ret = esp_bt_controller_disable();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "esp_bt_controller_disable failed: %d", ret);
}
ret = esp_bt_controller_deinit();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "esp_bt_controller_deinit failed: %d", ret);
}
return ret;
}
#endif
esp_err_t esp_hid_gap_deinit(void)
{
esp_err_t ret;
ret = deinit_low_level();
if (ret != ESP_OK) {
ESP_LOGE(TAG, "deinit_low_level failed: %d", ret);
}
if (bt_hidh_cb_semaphore != NULL) {
vSemaphoreDelete(bt_hidh_cb_semaphore);
bt_hidh_cb_semaphore = NULL;
}
if (ble_hidh_cb_semaphore != NULL) {
vSemaphoreDelete(ble_hidh_cb_semaphore);
ble_hidh_cb_semaphore = NULL;
}
return ESP_OK;
}
esp_err_t esp_hid_gap_init(uint8_t mode)
{
esp_err_t ret;
examples/bluetooth/esp_hid_device/main/esp_hid_gap.h
+1
View File
@@ -74,6 +74,7 @@ void print_uuid(esp_bt_uuid_t *uuid);
#endif
esp_err_t esp_hid_gap_init(uint8_t mode);
esp_err_t esp_hid_gap_deinit(void);
esp_err_t esp_hid_ble_gap_adv_init(uint16_t appearance, const char *device_name);
esp_err_t esp_hid_ble_gap_adv_start(void);
examples/bluetooth/esp_hid_host/main/esp_hid_gap.h
+2
View File
@@ -83,6 +83,8 @@ typedef struct esp_hidh_scan_result_s {
} esp_hid_scan_result_t;
esp_err_t esp_hid_gap_init(uint8_t mode);
esp_err_t esp_hid_gap_deinit(void);
esp_err_t esp_hid_scan(uint32_t seconds, size_t *num_results, esp_hid_scan_result_t **results);
void esp_hid_scan_results_free(esp_hid_scan_result_t *results);