kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ble): Avoid concurrent GATT notify using sem.

Browse source 
* Add a semaphore to avoid sending GATT
  notifies until the previous send was successful.
This commit is contained in:
Pete Johanson 2020-12-03 16:04:48 -05:00
parent bb9a4dd758
commit e6523ac766
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/src/hog.c
View file

@ -156,6 +156,23 @@ struct bt_conn *destination_connection() {
return conn; return conn;
} }
static K_SEM_DEFINE(hog_sem, 1, 1);
void hog_notify_complete(struct bt_conn *conn, void *user_data) { k_sem_give(&hog_sem); }
int send_notify(struct bt_conn *conn, struct bt_gatt_notify_params notify_params) {
notify_params.func = hog_notify_complete;
k_sem_take(&hog_sem, K_MSEC(30));
int err = bt_gatt_notify_cb(conn, &notify_params);
if (err) {
k_sem_give(&hog_sem);
}
bt_conn_unref(conn);
return err;
}
int zmk_hog_send_keyboard_report(struct zmk_hid_keyboard_report_body *report) { int zmk_hog_send_keyboard_report(struct zmk_hid_keyboard_report_body *report) {
struct bt_conn *conn = destination_connection(); struct bt_conn *conn = destination_connection();
if (conn == NULL) { if (conn == NULL) {
@ -164,10 +181,10 @@ int zmk_hog_send_keyboard_report(struct zmk_hid_keyboard_report_body *report) {
LOG_DBG("Sending to NULL? %s", conn == NULL ? "yes" : "no"); LOG_DBG("Sending to NULL? %s", conn == NULL ? "yes" : "no");
int err = bt_gatt_notify(conn, &hog_svc.attrs[5], report, return send_notify(
sizeof(struct zmk_hid_keyboard_report_body)); conn, ((struct bt_gatt_notify_params){.attr = &hog_svc.attrs[5],
bt_conn_unref(conn); .data = report,
return err; .len = sizeof(struct zmk_hid_keyboard_report_body)}));
}; };
int zmk_hog_send_consumer_report(struct zmk_hid_consumer_report_body *report) { int zmk_hog_send_consumer_report(struct zmk_hid_consumer_report_body *report) {
@ -176,8 +193,8 @@ int zmk_hog_send_consumer_report(struct zmk_hid_consumer_report_body *report) {
return -ENOTCONN; return -ENOTCONN;
} }
int err = bt_gatt_notify(conn, &hog_svc.attrs[10], report, return send_notify(
sizeof(struct zmk_hid_consumer_report_body)); conn, ((struct bt_gatt_notify_params){.attr = &hog_svc.attrs[10],
bt_conn_unref(conn); .data = report,
return err; .len = sizeof(struct zmk_hid_consumer_report_body)}));
}; };