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

fix(bt): Passkey entry pairing fixes.

Browse source 
* Don't propogate any key press events while in the
  middle of passkey entry, avoid funky state on hosts.
* Handle passkey on release, not press, to ensure key *releases*
  are not accidentally sent, especially the Enter release
  at the very end of passkey entry, which can trigger
  cancel in the dialog if the keyboard is connected
  via USB to the same host.
This commit is contained in:
Peter Johanson 2023-12-01 23:33:29 +00:00
parent 69f7bfb409
commit 1f9e3532f9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/ble.c
View file

@ -696,9 +696,9 @@ static int zmk_ble_handle_key_user(struct zmk_keycode_state_changed *event) {
return ZMK_EV_EVENT_BUBBLE; return ZMK_EV_EVENT_BUBBLE;
} }
if (!event->state) { if (event->state) {
LOG_DBG("Key released, ignoring"); LOG_DBG("Key press, ignoring");
return ZMK_EV_EVENT_BUBBLE; return ZMK_EV_EVENT_HANDLED;
} }
if (key == HID_USAGE_KEY_KEYBOARD_ESCAPE) { if (key == HID_USAGE_KEY_KEYBOARD_ESCAPE) {
@ -728,7 +728,7 @@ static int zmk_ble_handle_key_user(struct zmk_keycode_state_changed *event) {
zmk_ble_numeric_usage_to_value(key, HID_USAGE_KEY_KEYPAD_1_AND_END, zmk_ble_numeric_usage_to_value(key, HID_USAGE_KEY_KEYPAD_1_AND_END,
HID_USAGE_KEY_KEYPAD_0_AND_INSERT, &val))) { HID_USAGE_KEY_KEYPAD_0_AND_INSERT, &val))) {
LOG_DBG("Key not a number, ignoring"); LOG_DBG("Key not a number, ignoring");
return ZMK_EV_EVENT_BUBBLE; return ZMK_EV_EVENT_HANDLED;
} }
if (ring_buf_space_get(&passkey_entries) <= 0) { if (ring_buf_space_get(&passkey_entries) <= 0) {