fix(behaviors): make tap dances work on a combo
* Tap dance event handler goes after combos * Add test
This commit is contained in:
parent
d393247e15
commit
a61eac9139
5 changed files with 47 additions and 11 deletions
|
@ -47,13 +47,13 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
|
|||
target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_mod_morph.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_outputs.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_toggle_layer.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_to_layer.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_transparent.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_none.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_sensor_rotate_key_press.c)
|
||||
target_sources(app PRIVATE src/combo.c)
|
||||
target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c)
|
||||
target_sources(app PRIVATE src/behavior_queue.c)
|
||||
target_sources(app PRIVATE src/conditional_layer.c)
|
||||
target_sources(app PRIVATE src/endpoints.c)
|
||||
|
|
2
app/tests/tap-dance/6-combo-tap2/events.patterns
Normal file
2
app/tests/tap-dance/6-combo-tap2/events.patterns
Normal file
|
@ -0,0 +1,2 @@
|
|||
s/.*hid_listener_keycode/kp/p
|
||||
s/.*on_tap_dance_binding/td_binding/p
|
7
app/tests/tap-dance/6-combo-tap2/keycode_events.snapshot
Normal file
7
app/tests/tap-dance/6-combo-tap2/keycode_events.snapshot
Normal file
|
@ -0,0 +1,7 @@
|
|||
td_binding_pressed: 4 created new tap dance
|
||||
td_binding_pressed: 4 tap dance pressed
|
||||
td_binding_released: 4 tap dance keybind released
|
||||
td_binding_pressed: 4 tap dance pressed
|
||||
td_binding_released: 4 tap dance keybind released
|
||||
kp_pressed: usage_page 0x07 keycode 0x1F implicit_mods 0x00 explicit_mods 0x00
|
||||
kp_released: usage_page 0x07 keycode 0x1F implicit_mods 0x00 explicit_mods 0x00
|
17
app/tests/tap-dance/6-combo-tap2/native_posix_64.keymap
Normal file
17
app/tests/tap-dance/6-combo-tap2/native_posix_64.keymap
Normal file
|
@ -0,0 +1,17 @@
|
|||
#include <dt-bindings/zmk/keys.h>
|
||||
#include <behaviors.dtsi>
|
||||
#include <dt-bindings/zmk/kscan_mock.h>
|
||||
#include "../behavior_keymap.dtsi"
|
||||
|
||||
&kscan {
|
||||
events = <
|
||||
ZMK_MOCK_PRESS(0,0,10)
|
||||
ZMK_MOCK_PRESS(0,1,10)
|
||||
ZMK_MOCK_RELEASE(0,0,10)
|
||||
ZMK_MOCK_RELEASE(0,1,10)
|
||||
ZMK_MOCK_PRESS(0,0,10)
|
||||
ZMK_MOCK_PRESS(0,1,10)
|
||||
ZMK_MOCK_RELEASE(0,0,10)
|
||||
ZMK_MOCK_RELEASE(0,1,200)
|
||||
>;
|
||||
};
|
|
@ -3,7 +3,7 @@
|
|||
#include <dt-bindings/zmk/kscan_mock.h>
|
||||
|
||||
/ {
|
||||
behaviors {
|
||||
behaviors {
|
||||
ht: hold_tap {
|
||||
compatible = "zmk,behavior-hold-tap";
|
||||
label = "HOLD_TAP";
|
||||
|
@ -47,14 +47,24 @@
|
|||
};
|
||||
};
|
||||
|
||||
keymap {
|
||||
compatible = "zmk,keymap";
|
||||
label ="Default keymap";
|
||||
combos {
|
||||
compatible = "zmk,combos";
|
||||
|
||||
default_layer {
|
||||
bindings = <
|
||||
&tdm &tds
|
||||
&tdb &td2>;
|
||||
};
|
||||
};
|
||||
td_combo {
|
||||
bindings = <&tdb>;
|
||||
key-positions = <0 1>;
|
||||
timeout-ms = <50>;
|
||||
};
|
||||
};
|
||||
|
||||
keymap {
|
||||
compatible = "zmk,keymap";
|
||||
label = "Default keymap";
|
||||
|
||||
default_layer {
|
||||
bindings = <
|
||||
&tdm &tds
|
||||
&tdb &td2>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue