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

Fix leader overlapping with timerless

Browse source
This commit is contained in:
Nick Conway 2023-06-04 02:23:15 -04:00
parent bbd888e93c
commit aab348a142
No known key found for this signature in database
GPG key ID: AA850592E4C1D453
5 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/leader.c
View file

@ -324,7 +324,7 @@ static int position_state_changed_listener(const zmk_event_t *ev) {
zmk_leader_deactivate();
}
}
if (!timerless) {
if (!timerless || num_comp_candidates < num_candidates) {
reset_timer(data->timestamp);
}
}

37
app/tests/leader/behavior_keymap_overlap_timerless.dtsi Normal file
View file

@ -0,0 +1,37 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
&leader {
timeout-ms = <200>;
timerless;
};
/ {
leader-sequences {
compatible = "zmk,leader-sequences";
leader_seq_one {
key-positions = <0>;
bindings = <&kp A>;
};
leader_seq_two {
key-positions = <0 0>;
bindings = <&kp B>;
};
};
keymap {
compatible = "zmk,keymap";
label ="Default keymap";
default_layer {
bindings = <
&kp N1 &kp N2
&kp N3 &leader
>;
};
};
};

2
app/tests/leader/overlapping-timerless/events.patterns Normal file
View file

@ -0,0 +1,2 @@
s/.*hid_listener_keycode_//p
s/.*zmk_leader.*:/leader:/p

4
app/tests/leader/overlapping-timerless/keycode_events.snapshot Normal file
View file

@ -0,0 +1,4 @@
leader: leader key activated
pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
leader: leader key deactivated

10
app/tests/leader/overlapping-timerless/native_posix_64.keymap Normal file
View file

@ -0,0 +1,10 @@
#include "../behavior_keymap_overlap_timerless.dtsi"
&kscan {
events = <
ZMK_MOCK_PRESS(1,1,10)
ZMK_MOCK_RELEASE(1,1,10)
ZMK_MOCK_PRESS(0,0,10)
ZMK_MOCK_RELEASE(0,0,2000)
>;
};