espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-06-05 21:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble):forward HID report/control/protocol writes as HIDD events

Browse Source
This commit is contained in:
Mayank Tyagi
2026-05-12 11:55:19 +05:30
parent 5045cb5eb8
commit 61a88ab53b
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/services/hid/include/services/hid/ble_svc_hid.h
+7 -1
View File
@@ -58,7 +58,7 @@ extern "C" {
struct report { struct report {
uint8_t data[RPT_MAX_LEN]; uint8_t data[RPT_MAX_LEN];
uint8_t len; uint16_t len;
uint8_t type; uint8_t type;
uint8_t id; uint8_t id;
uint16_t handle; uint16_t handle;
@@ -110,10 +110,16 @@ struct ble_svc_hid_params{
uint16_t ctrl_pt_handle; uint16_t ctrl_pt_handle;
}; };
typedef void (*ble_svc_hid_report_write_cb_t)(uint16_t attr_handle, uint8_t report_type,
uint8_t report_id, const uint8_t *data, uint16_t len);
typedef void (*ble_svc_hid_char_write_cb_t)(uint16_t attr_handle, uint16_t char_uuid16, uint8_t value);
void ble_svc_hid_init(void); void ble_svc_hid_init(void);
void ble_svc_hid_deinit(void); void ble_svc_hid_deinit(void);
int ble_svc_hid_add(struct ble_svc_hid_params params); int ble_svc_hid_add(struct ble_svc_hid_params params);
void ble_svc_hid_reset(void); void ble_svc_hid_reset(void);
void ble_svc_hid_register_report_write_cb(ble_svc_hid_report_write_cb_t cb);
void ble_svc_hid_register_char_write_cb(ble_svc_hid_char_write_cb_t cb);
#ifdef __cplusplus #ifdef __cplusplus
} }
nimble/host/services/hid/src/ble_svc_hid.c
+30 -1
View File
@@ -54,6 +54,8 @@ static const ble_uuid16_t uuid_boot_kbd_inp = BLE_UUID16_INIT(BLE_SVC_HID_CHR_UU
static const ble_uuid16_t uuid_boot_kbd_out = BLE_UUID16_INIT(BLE_SVC_HID_CHR_UUID16_BOOT_KBD_OUT); static const ble_uuid16_t uuid_boot_kbd_out = BLE_UUID16_INIT(BLE_SVC_HID_CHR_UUID16_BOOT_KBD_OUT);
static const ble_uuid16_t uuid_boot_mouse_inp = BLE_UUID16_INIT(BLE_SVC_HID_CHR_UUID16_BOOT_MOUSE_INP); static const ble_uuid16_t uuid_boot_mouse_inp = BLE_UUID16_INIT(BLE_SVC_HID_CHR_UUID16_BOOT_MOUSE_INP);
static const ble_uuid16_t uuid_hid_svc = BLE_UUID16_INIT(BLE_SVC_HID_UUID16); static const ble_uuid16_t uuid_hid_svc = BLE_UUID16_INIT(BLE_SVC_HID_UUID16);
static ble_svc_hid_report_write_cb_t s_report_write_cb;
static ble_svc_hid_char_write_cb_t s_char_write_cb;
#if !MYNEWT_VAL(BLE_STATIC_TO_DYNAMIC) #if !MYNEWT_VAL(BLE_STATIC_TO_DYNAMIC)
static struct ble_svc_hid_params hid_instances[HID_MAX_SVC_INSTANCES]; static struct ble_svc_hid_params hid_instances[HID_MAX_SVC_INSTANCES];
@@ -591,6 +593,9 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
} }
if(val == 0 || val == 1) { if(val == 0 || val == 1) {
rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof hid_instances[instance].ctrl_pt, &hid_instances[instance].ctrl_pt, NULL); rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof hid_instances[instance].ctrl_pt, &hid_instances[instance].ctrl_pt, NULL);
if (rc == 0 && s_char_write_cb) {
s_char_write_cb(attr_handle, BLE_SVC_HID_CHR_UUID16_HID_CTRL_PT, hid_instances[instance].ctrl_pt);
}
return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
} }
return BLE_ATT_ERR_UNLIKELY; return BLE_ATT_ERR_UNLIKELY;
@@ -605,7 +610,13 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
sizeof(hid_instances[instance].kbd_out_rpt)); sizeof(hid_instances[instance].kbd_out_rpt));
return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
} else if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { } else if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].kbd_out_rpt), &hid_instances[instance].kbd_out_rpt, NULL); rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].kbd_out_rpt),
&hid_instances[instance].kbd_out_rpt, &out_rpt_len);
if (rc == 0 && s_report_write_cb) {
s_report_write_cb(attr_handle, BLE_SVC_HID_RPT_TYPE_OUTPUT, 0,
&hid_instances[instance].kbd_out_rpt,
out_rpt_len);
}
return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
} }
return 0; return 0;
@@ -664,6 +675,9 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
} }
if(val == 0 || val == 1) { if(val == 0 || val == 1) {
rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].proto_mode), &hid_instances[instance].proto_mode, NULL); rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].proto_mode), &hid_instances[instance].proto_mode, NULL);
if (rc == 0 && s_char_write_cb) {
s_char_write_cb(attr_handle, BLE_SVC_HID_CHR_UUID16_PROTOCOL_MODE, hid_instances[instance].proto_mode);
}
return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
} }
return BLE_ATT_ERR_UNLIKELY; return BLE_ATT_ERR_UNLIKELY;
@@ -686,6 +700,9 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
return BLE_ATT_ERR_INSUFFICIENT_RES; return BLE_ATT_ERR_INSUFFICIENT_RES;
} }
rpt->len = out_rpt_len; rpt->len = out_rpt_len;
if (s_report_write_cb) {
s_report_write_cb(attr_handle, rpt->type, rpt->id, rpt->data, rpt->len);
}
if (ctxt->chr->flags & BLE_GATT_CHR_F_NOTIFY) { if (ctxt->chr->flags & BLE_GATT_CHR_F_NOTIFY) {
ble_gatts_chr_updated(*(ctxt->chr->val_handle)); ble_gatts_chr_updated(*(ctxt->chr->val_handle));
} }
@@ -865,5 +882,17 @@ ble_svc_hid_init(void)
SYSINIT_PANIC_ASSERT(rc == 0); SYSINIT_PANIC_ASSERT(rc == 0);
} }
void
ble_svc_hid_register_report_write_cb(ble_svc_hid_report_write_cb_t cb)
{
s_report_write_cb = cb;
}
void
ble_svc_hid_register_char_write_cb(ble_svc_hid_char_write_cb_t cb)
{
s_char_write_cb = cb;
}
#endif #endif
#endif // CONFIG_BT_NIMBLE_HID_SERVICE #endif // CONFIG_BT_NIMBLE_HID_SERVICE