fc511e40cc
* 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. * An event can be captured and released in the same event handler, before the last_listener_index would have been updated. This causes some handlers to be triggered multiple times. * The solution is to update the last_listener_index before calling the next event handler, so capturing and releasing within an event handler is harmless. * Also see discussion at https://github.com/zmkfirmware/zmk/pull/1401 * If our handler dedides our undedided hold-tap, return early before continuing. * Fix incorrect pointer logic, resulting in combo candidate filtering leaving incorrect timeout details. Co-authored-by: Andrew Rae <ajrae.nv@gmail.com> Co-authored-by: okke <okke@formsma.nl>
46 lines
No EOL
816 B
Text
46 lines
No EOL
816 B
Text
#include <dt-bindings/zmk/keys.h>
|
|
#include <behaviors.dtsi>
|
|
#include <dt-bindings/zmk/kscan-mock.h>
|
|
|
|
|
|
#define ZMK_COMBO(name, combo_bindings, keypos, combo_term) \
|
|
/ { \
|
|
combos { \
|
|
compatible = "zmk,combos"; \
|
|
combo_ ## name { \
|
|
key-positions = <keypos>; \
|
|
bindings = <combo_bindings>; \
|
|
timeout-ms = <combo_term>; \
|
|
}; \
|
|
}; \
|
|
};
|
|
|
|
ZMK_COMBO(qmark, &kp QMARK, 0 3, 30)
|
|
ZMK_COMBO(dllr, &kp DLLR, 1 3, 50)
|
|
ZMK_COMBO(tilde, &kp TILDE, 3 4, 50)
|
|
|
|
/ {
|
|
keymap {
|
|
compatible = "zmk,keymap";
|
|
label = "Default keymap";
|
|
|
|
default_layer {
|
|
bindings = <
|
|
&none &none
|
|
&kp A &mt LSHFT T
|
|
&none
|
|
>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&kscan {
|
|
rows = <3>;
|
|
columns = <2>;
|
|
events = <
|
|
ZMK_MOCK_PRESS(1,1,500)
|
|
ZMK_MOCK_PRESS(1,0,100)
|
|
ZMK_MOCK_RELEASE(1,0,500)
|
|
ZMK_MOCK_RELEASE(1,1,0)
|
|
>;
|
|
}; |