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/ble_hidd_remove_ccc_gating' into 'master'

Browse Source 
fix(esp_hid/bluedroid): remove app-layer CCC gating in HID device

Closes BCI-601

See merge request espressif/esp-idf!50766
This commit is contained in:
Island
2026-07-21 10:39:23 +08:00
parent 6889f38644 81bbcaca4e
commit bf05267d95
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hid/src/ble_hidd.c
+8 -10
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -822,17 +822,15 @@ static esp_err_t esp_ble_hidd_dev_battery_set(void *devp, uint8_t level)
} }
dev->bat_level = level; dev->bat_level = level;
if (!dev->connected || dev->bat_ccc.value == 0) { if (!dev->connected) {
//if we are not yet connected, that is not an error //if we are not yet connected, that is not an error
return ESP_OK; return ESP_OK;
} }
if (dev->bat_ccc.notify_enable) { ret = esp_ble_gatts_send_indicate(dev->bat_svc.gatt_if, dev->conn_id, dev->bat_level_handle, 1, &dev->bat_level, false);
ret = esp_ble_gatts_send_indicate(dev->bat_svc.gatt_if, dev->conn_id, dev->bat_level_handle, 1, &dev->bat_level, false); if (ret) {
if (ret) { ESP_LOGE(TAG, "esp_ble_gatts_send_notify failed: %d", ret);
ESP_LOGE(TAG, "esp_ble_gatts_send_notify failed: %d", ret); return ESP_FAIL;
return ESP_FAIL;
}
} }
return ESP_OK; return ESP_OK;
@@ -856,7 +854,7 @@ static esp_err_t esp_ble_hidd_dev_input_set(void *devp, size_t index, size_t id,
return ESP_FAIL; return ESP_FAIL;
} }
if ((p_rpt = get_report_by_id_and_type(dev, id, ESP_HID_REPORT_TYPE_INPUT)) != NULL && p_rpt->ccc.value) { if ((p_rpt = get_report_by_id_and_type(dev, id, ESP_HID_REPORT_TYPE_INPUT)) != NULL) {
esp_err_t err = esp_ble_gatts_send_indicate(dev->devices[index].hid_svc.gatt_if, dev->conn_id, p_rpt->handle, length, data, p_rpt->ccc.indicate_enable); esp_err_t err = esp_ble_gatts_send_indicate(dev->devices[index].hid_svc.gatt_if, dev->conn_id, p_rpt->handle, length, data, p_rpt->ccc.indicate_enable);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Send Input Indicate Failed: %d", err); ESP_LOGE(TAG, "Send Input Indicate Failed: %d", err);
@@ -896,7 +894,7 @@ static esp_err_t esp_ble_hidd_dev_feature_set(void *devp, size_t index, size_t i
return ESP_FAIL; return ESP_FAIL;
} }
WAIT_CB(dev); WAIT_CB(dev);
if (dev->connected && p_rpt->ccc.value) { if (dev->connected) {
ret = esp_ble_gatts_send_indicate(dev->devices[index].hid_svc.gatt_if, dev->conn_id, p_rpt->handle, length, data, p_rpt->ccc.indicate_enable); ret = esp_ble_gatts_send_indicate(dev->devices[index].hid_svc.gatt_if, dev->conn_id, p_rpt->handle, length, data, p_rpt->ccc.indicate_enable);
if (ret != ESP_OK) { if (ret != ESP_OK) {
ESP_LOGE(TAG, "Send Feature Indicate Failed: %d", ret); ESP_LOGE(TAG, "Send Feature Indicate Failed: %d", ret);