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

fix(nimble): Always read initial BAS level

Browse Source
This commit is contained in:
Mayank Tyagi
2026-05-21 11:51:07 +05:30
parent 31c97255ee
commit cce63cb778
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hid/src/nimble_hidh.c
+17 -3
View File
@@ -70,14 +70,14 @@ static inline void SEND_CB(void)
static inline void LOCK_OPS(void) static inline void LOCK_OPS(void)
{ {
if (s_ble_hidh_op_mutex) { if (s_ble_hidh_op_mutex) {
xSemaphoreTake(s_ble_hidh_op_mutex, portMAX_DELAY); xSemaphoreTakeRecursive(s_ble_hidh_op_mutex, portMAX_DELAY);
} }
} }
static inline void UNLOCK_OPS(void) static inline void UNLOCK_OPS(void)
{ {
if (s_ble_hidh_op_mutex) { if (s_ble_hidh_op_mutex) {
xSemaphoreGive(s_ble_hidh_op_mutex); xSemaphoreGiveRecursive(s_ble_hidh_op_mutex);
} }
} }
@@ -789,6 +789,20 @@ static void attach_report_listeners(esp_hidh_dev_t *dev)
report = dev->reports; report = dev->reports;
if (dev->ble.battery_handle) { if (dev->ble.battery_handle) {
uint8_t *rdata = NULL;
uint16_t rlen = 0;
if (event_loop_handle &&
read_char(dev->ble.conn_id, dev->ble.battery_handle, &rdata, &rlen) == 0 &&
rlen >= 1 && rdata != NULL) {
esp_hidh_event_data_t p = {0};
p.battery.dev = dev;
p.battery.level = rdata[0];
esp_event_post_to(event_loop_handle, ESP_HIDH_EVENTS, ESP_HIDH_BATTERY_EVENT,
&p, sizeof(esp_hidh_event_data_t), portMAX_DELAY);
}
free(rdata);
register_for_notify(dev->ble.conn_id, dev->ble.battery_handle); register_for_notify(dev->ble.conn_id, dev->ble.battery_handle);
if (dev->ble.battery_ccc_handle && dev->ble.conn_id >= 0 && dev->connected) { if (dev->ble.battery_ccc_handle && dev->ble.conn_id >= 0 && dev->connected) {
write_char_descr(dev, dev->ble.battery_ccc_handle, 2, (uint8_t *)&ccc_data); write_char_descr(dev, dev->ble.battery_ccc_handle, 2, (uint8_t *)&ccc_data);
@@ -1174,7 +1188,7 @@ esp_err_t esp_ble_hidh_init(const esp_hidh_config_t *config)
s_ble_hidh_cb_semaphore = xSemaphoreCreateBinary(); s_ble_hidh_cb_semaphore = xSemaphoreCreateBinary();
ESP_RETURN_ON_FALSE(s_ble_hidh_cb_semaphore, ESP_RETURN_ON_FALSE(s_ble_hidh_cb_semaphore,
ESP_ERR_NO_MEM, TAG, "Allocation failed"); ESP_ERR_NO_MEM, TAG, "Allocation failed");
s_ble_hidh_op_mutex = xSemaphoreCreateMutex(); s_ble_hidh_op_mutex = xSemaphoreCreateRecursiveMutex();
if (s_ble_hidh_op_mutex == NULL) { if (s_ble_hidh_op_mutex == NULL) {
vSemaphoreDelete(s_ble_hidh_cb_semaphore); vSemaphoreDelete(s_ble_hidh_cb_semaphore);
s_ble_hidh_cb_semaphore = NULL; s_ble_hidh_cb_semaphore = NULL;
examples/bluetooth/esp_hid_device/main/esp_hid_device_main.c
+2
View File
@@ -41,6 +41,7 @@
#include "esp_hid_gap.h" #include "esp_hid_gap.h"
static const char *TAG = "HID_DEV_DEMO"; static const char *TAG = "HID_DEV_DEMO";
#define HID_BATTERY_LEVEL 60
typedef struct typedef struct
{ {
@@ -941,6 +942,7 @@ void app_main(void)
ESP_LOGI(TAG, "setting ble device"); ESP_LOGI(TAG, "setting ble device");
ESP_ERROR_CHECK( ESP_ERROR_CHECK(
esp_hidd_dev_init(&ble_hid_config, ESP_HID_TRANSPORT_BLE, ble_hidd_event_callback, &s_ble_hid_param.hid_dev)); esp_hidd_dev_init(&ble_hid_config, ESP_HID_TRANSPORT_BLE, ble_hidd_event_callback, &s_ble_hid_param.hid_dev));
ESP_ERROR_CHECK(esp_hidd_dev_battery_set(s_ble_hid_param.hid_dev, HID_BATTERY_LEVEL));
#endif #endif
#if CONFIG_BT_HID_DEVICE_ENABLED #if CONFIG_BT_HID_DEVICE_ENABLED