pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(sticky keys): fix tapping-sticky-keys bug.

Browse source 
Sticky keys should be cleared when they were tapped in rapid succession before the timer runs out.
This commit is contained in:
Okke Formsma 2020-11-30 22:02:57 +01:00 committed by Pete Johanson
parent f86e0fff14
commit e00eceb508
4 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/behaviors/behavior_sticky_key.c
View file

@ -127,9 +127,13 @@ static int on_sticky_key_binding_pressed(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) { struct zmk_behavior_binding_event event) {
struct device *dev = device_get_binding(binding->behavior_dev); struct device *dev = device_get_binding(binding->behavior_dev);
const struct behavior_sticky_key_config *cfg = dev->config_info; const struct behavior_sticky_key_config *cfg = dev->config_info;
struct active_sticky_key *sticky_key;
struct active_sticky_key *sticky_key = sticky_key = find_sticky_key(event.position);
store_sticky_key(event.position, binding->param1, binding->param2, cfg); if (sticky_key != NULL) {
stop_timer(sticky_key);
release_sticky_key_behavior(sticky_key, event.timestamp);
}
sticky_key = store_sticky_key(event.position, binding->param1, binding->param2, cfg);
if (sticky_key == NULL) { if (sticky_key == NULL) {
LOG_ERR("unable to store sticky key, did you press more than %d sticky_key?", LOG_ERR("unable to store sticky key, did you press more than %d sticky_key?",
ZMK_BHV_STICKY_KEY_MAX_HELD); ZMK_BHV_STICKY_KEY_MAX_HELD);

1
app/tests/sticky-keys/9-sk-dn-up-dn-up/events.patterns Normal file
View file

@ -0,0 +1 @@
s/.*hid_listener_keycode_//p

4
app/tests/sticky-keys/9-sk-dn-up-dn-up/keycode_events.snapshot Normal file
View file

@ -0,0 +1,4 @@
pressed: usage_page 0x07 keycode 0xe1 mods 0x00
released: usage_page 0x07 keycode 0xe1 mods 0x00
pressed: usage_page 0x07 keycode 0xe1 mods 0x00
released: usage_page 0x07 keycode 0xe1 mods 0x00

27
app/tests/sticky-keys/9-sk-dn-up-dn-up/native_posix.keymap Normal file
View file

@ -0,0 +1,27 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan-mock.h>
/ {
keymap {
compatible = "zmk,keymap";
label ="Default keymap";
default_layer {
bindings = <
&sk LEFT_SHIFT &none
&none &none
>;
};
};
};
&kscan {
events = <
ZMK_MOCK_PRESS(0,0,10)
ZMK_MOCK_RELEASE(0,0,10)
/* the sticky key is pressed again, so the previous one must be cancelled */
ZMK_MOCK_PRESS(0,0,10)
ZMK_MOCK_RELEASE(0,0,1200)
>;
};