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

fix(behaviors): make tap dances work on a combo

Browse source 
* Tap dance event handler goes after combos
* Add test
This commit is contained in:
Okke Formsma 2022-11-01 21:13:19 +01:00 committed by GitHub
parent d393247e15
commit a61eac9139
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/CMakeLists.txt
View file

@ -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_momentary_layer.c)
target_sources(app PRIVATE src/behaviors/behavior_mod_morph.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_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_toggle_layer.c)
target_sources(app PRIVATE src/behaviors/behavior_to_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_transparent.c)
target_sources(app PRIVATE src/behaviors/behavior_none.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/behaviors/behavior_sensor_rotate_key_press.c)
target_sources(app PRIVATE src/combo.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/behavior_queue.c)
target_sources(app PRIVATE src/conditional_layer.c) target_sources(app PRIVATE src/conditional_layer.c)
target_sources(app PRIVATE src/endpoints.c) target_sources(app PRIVATE src/endpoints.c)

2
app/tests/tap-dance/6-combo-tap2/events.patterns Normal file
View 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
View 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
View 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)
>;
};

30
app/tests/tap-dance/behavior_keymap.dtsi
View file

@ -3,7 +3,7 @@
#include <dt-bindings/zmk/kscan_mock.h> #include <dt-bindings/zmk/kscan_mock.h>
/ { / {
behaviors { behaviors {
ht: hold_tap { ht: hold_tap {
compatible = "zmk,behavior-hold-tap"; compatible = "zmk,behavior-hold-tap";
label = "HOLD_TAP"; label = "HOLD_TAP";
@ -47,14 +47,24 @@
}; };
}; };
keymap { combos {
compatible = "zmk,keymap"; compatible = "zmk,combos";
label ="Default keymap";
default_layer { td_combo {
bindings = < bindings = <&tdb>;
&tdm &tds key-positions = <0 1>;
&tdb &td2>; timeout-ms = <50>;
}; };
}; };
keymap {
compatible = "zmk,keymap";
label = "Default keymap";
default_layer {
bindings = <
&tdm &tds
&tdb &td2>;
};
};
}; };