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

fix(behaviors): Fixing erroneous combo triggering (#1395)

Browse source 
This is a very simple fix to a rather complicated issue. Essentially,
hold-taps will "release" (raise) their captured keys before actually
telling the event manager they have captured a key. This means the event
manager ends up assigning the `last_listener_index` to the hold-tap
subscription rather than the combo. So when the combo calls
`ZMK_EVENT_RELEASE` it raises after the hold-tap instead of after the
combo as the combo code expects.

The corresponding test (which fails without this change) has also been added.
This commit is contained in:
Andrew Rae 2022-07-25 11:02:57 -07:00 • committed by Peter Johanson
parent 8bc96ab9fe
commit 8e9db11165
4 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/combo.c
View file

@ -253,7 +253,7 @@ static int release_pressed_keys() {
if (i == 0) {
LOG_DBG("combo: releasing position event %d",
as_zmk_position_state_changed(captured_event)->position);
ZMK_EVENT_RELEASE(captured_event)
ZMK_EVENT_RAISE_AFTER(captured_event, combo);
} else {
// reprocess events (see tests/combo/fully-overlapping-combos-3 for why this is needed)
LOG_DBG("combo: reraising position event %d",

1
app/tests/combo/combos-and-holdtaps-3/events.patterns Normal file
View file

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

5
app/tests/combo/combos-and-holdtaps-3/keycode_events.snapshot Normal file
View file

@ -0,0 +1,5 @@
pressed: usage_page 0x07 keycode 0xE5 implicit_mods 0x00 explicit_mods 0x00
pressed: usage_page 0x07 keycode 0x05 implicit_mods 0x00 explicit_mods 0x00
pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
released: usage_page 0x07 keycode 0x05 implicit_mods 0x00 explicit_mods 0x00
released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00

40
app/tests/combo/combos-and-holdtaps-3/native_posix_64.keymap Normal file
View file

@ -0,0 +1,40 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan-mock.h>
&mt {
flavor = "hold-preferred";
};
/ {
combos {
compatible = "zmk,combos";
combo_one {
timeout-ms = <40>;
key-positions = <0 1>;
bindings = <&kp X>;
};
};
keymap {
compatible = "zmk,keymap";
label = "Default keymap";
default_layer {
bindings = <
&kp A &kp B
&mt RSHFT RET &kp C
>;
};
};
};
&kscan {
events = <
ZMK_MOCK_PRESS(1,0,10)
ZMK_MOCK_PRESS(0,1,10)
ZMK_MOCK_PRESS(1,1,10)
ZMK_MOCK_RELEASE(0,1,50)
ZMK_MOCK_RELEASE(1,1,50)
>;
};