From a1389e76daed7fa7188ff17e61f8155d8ebec019 Mon Sep 17 00:00:00 2001 From: Nick Conway Date: Mon, 16 Jun 2025 14:03:25 -0400 Subject: [PATCH] fix(leader-key): fix tests --- app/tests/leader/basic/events.patterns | 1 + app/tests/leader/behavior_keymap.dtsi | 12 +++++------- app/tests/leader/behavior_keymap_overlap.dtsi | 10 ++++------ .../leader/behavior_keymap_overlap_immediate.dtsi | 10 ++++------ .../leader/behavior_keymap_overlap_timerless.dtsi | 5 +++-- app/tests/leader/behavior_keymap_three.dtsi | 5 +++-- app/tests/leader/double-tap/events.patterns | 1 + app/tests/leader/double-tap2/events.patterns | 1 + app/tests/leader/none/events.patterns | 1 + .../leader/overlapping-immediate/events.patterns | 1 + app/tests/leader/overlapping-timeout/events.patterns | 1 + .../overlapping-timeout/keycode_events.snapshot | 1 + .../leader/overlapping-timerless/events.patterns | 1 + .../overlapping-timerless/keycode_events.snapshot | 1 + app/tests/leader/overlapping/events.patterns | 1 + app/tests/leader/roll-reverse/events.patterns | 1 + app/tests/leader/roll-three-mix/events.patterns | 1 + app/tests/leader/roll-three-mix2/events.patterns | 1 + app/tests/leader/roll-three/events.patterns | 1 + app/tests/leader/roll/events.patterns | 1 + app/tests/leader/timeout/events.patterns | 1 + app/tests/leader/timeout/keycode_events.snapshot | 1 + app/tests/leader/two-seq/events.patterns | 1 + 23 files changed, 37 insertions(+), 23 deletions(-) diff --git a/app/tests/leader/basic/events.patterns b/app/tests/leader/basic/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/basic/events.patterns +++ b/app/tests/leader/basic/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/behavior_keymap.dtsi b/app/tests/leader/behavior_keymap.dtsi index dbcbf55aa..fd5ea68d4 100644 --- a/app/tests/leader/behavior_keymap.dtsi +++ b/app/tests/leader/behavior_keymap.dtsi @@ -2,13 +2,12 @@ #include #include -&leader { - timeout-ms = <200>; -}; - / { - leader-sequences { - compatible = "zmk,leader-sequences"; + + leader: leader { + compatible = "zmk,behavior-leader-key"; + #binding-cells = <0>; + timeout-ms = <200>; leader_seq_one { key-positions = <0>; @@ -24,7 +23,6 @@ key-positions = <3>; bindings = <&kp N1>; }; - }; keymap { diff --git a/app/tests/leader/behavior_keymap_overlap.dtsi b/app/tests/leader/behavior_keymap_overlap.dtsi index 8f3980851..0fb5d06f0 100644 --- a/app/tests/leader/behavior_keymap_overlap.dtsi +++ b/app/tests/leader/behavior_keymap_overlap.dtsi @@ -2,13 +2,11 @@ #include #include -&leader { - timeout-ms = <200>; -}; - / { - leader-sequences { - compatible = "zmk,leader-sequences"; + leader: leader { + compatible = "zmk,behavior-leader-key"; + #binding-cells = <0>; + timeout-ms = <200>; leader_seq_one { key-positions = <0>; diff --git a/app/tests/leader/behavior_keymap_overlap_immediate.dtsi b/app/tests/leader/behavior_keymap_overlap_immediate.dtsi index c05aeb993..996a4165a 100644 --- a/app/tests/leader/behavior_keymap_overlap_immediate.dtsi +++ b/app/tests/leader/behavior_keymap_overlap_immediate.dtsi @@ -2,13 +2,11 @@ #include #include -&leader { - timeout-ms = <200>; -}; - / { - leader-sequences { - compatible = "zmk,leader-sequences"; + leader: leader { + compatible = "zmk,behavior-leader-key"; + #binding-cells = <0>; + timeout-ms = <200>; leader_seq_one { key-positions = <0>; diff --git a/app/tests/leader/behavior_keymap_overlap_timerless.dtsi b/app/tests/leader/behavior_keymap_overlap_timerless.dtsi index 1c338d2b2..2d87af949 100644 --- a/app/tests/leader/behavior_keymap_overlap_timerless.dtsi +++ b/app/tests/leader/behavior_keymap_overlap_timerless.dtsi @@ -3,8 +3,9 @@ #include / { - leader-sequences { - compatible = "zmk,leader-sequences"; + leader: leader { + compatible = "zmk,behavior-leader-key"; + #binding-cells = <0>; leader_seq_one { key-positions = <0>; diff --git a/app/tests/leader/behavior_keymap_three.dtsi b/app/tests/leader/behavior_keymap_three.dtsi index 54f05f222..996a6d95c 100644 --- a/app/tests/leader/behavior_keymap_three.dtsi +++ b/app/tests/leader/behavior_keymap_three.dtsi @@ -3,8 +3,9 @@ #include / { - leader-sequences { - compatible = "zmk,leader-sequences"; + leader: leader { + compatible = "zmk,behavior-leader-key"; + #binding-cells = <0>; leader_seq_one { key-positions = <0 1 2>; diff --git a/app/tests/leader/double-tap/events.patterns b/app/tests/leader/double-tap/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/double-tap/events.patterns +++ b/app/tests/leader/double-tap/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/double-tap2/events.patterns b/app/tests/leader/double-tap2/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/double-tap2/events.patterns +++ b/app/tests/leader/double-tap2/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/none/events.patterns b/app/tests/leader/none/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/none/events.patterns +++ b/app/tests/leader/none/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/overlapping-immediate/events.patterns b/app/tests/leader/overlapping-immediate/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/overlapping-immediate/events.patterns +++ b/app/tests/leader/overlapping-immediate/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/overlapping-timeout/events.patterns b/app/tests/leader/overlapping-timeout/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/overlapping-timeout/events.patterns +++ b/app/tests/leader/overlapping-timeout/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/overlapping-timeout/keycode_events.snapshot b/app/tests/leader/overlapping-timeout/keycode_events.snapshot index 9ab32b1a8..612a71e66 100644 --- a/app/tests/leader/overlapping-timeout/keycode_events.snapshot +++ b/app/tests/leader/overlapping-timeout/keycode_events.snapshot @@ -1,4 +1,5 @@ leader: leader key activated +leader: deactivating leader due to timeout 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 diff --git a/app/tests/leader/overlapping-timerless/events.patterns b/app/tests/leader/overlapping-timerless/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/overlapping-timerless/events.patterns +++ b/app/tests/leader/overlapping-timerless/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/overlapping-timerless/keycode_events.snapshot b/app/tests/leader/overlapping-timerless/keycode_events.snapshot index 9ab32b1a8..612a71e66 100644 --- a/app/tests/leader/overlapping-timerless/keycode_events.snapshot +++ b/app/tests/leader/overlapping-timerless/keycode_events.snapshot @@ -1,4 +1,5 @@ leader: leader key activated +leader: deactivating leader due to timeout 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 diff --git a/app/tests/leader/overlapping/events.patterns b/app/tests/leader/overlapping/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/overlapping/events.patterns +++ b/app/tests/leader/overlapping/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/roll-reverse/events.patterns b/app/tests/leader/roll-reverse/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/roll-reverse/events.patterns +++ b/app/tests/leader/roll-reverse/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/roll-three-mix/events.patterns b/app/tests/leader/roll-three-mix/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/roll-three-mix/events.patterns +++ b/app/tests/leader/roll-three-mix/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/roll-three-mix2/events.patterns b/app/tests/leader/roll-three-mix2/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/roll-three-mix2/events.patterns +++ b/app/tests/leader/roll-three-mix2/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/roll-three/events.patterns b/app/tests/leader/roll-three/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/roll-three/events.patterns +++ b/app/tests/leader/roll-three/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/roll/events.patterns b/app/tests/leader/roll/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/roll/events.patterns +++ b/app/tests/leader/roll/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/timeout/events.patterns b/app/tests/leader/timeout/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/timeout/events.patterns +++ b/app/tests/leader/timeout/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p diff --git a/app/tests/leader/timeout/keycode_events.snapshot b/app/tests/leader/timeout/keycode_events.snapshot index c476ce63b..9cdecd414 100644 --- a/app/tests/leader/timeout/keycode_events.snapshot +++ b/app/tests/leader/timeout/keycode_events.snapshot @@ -1,2 +1,3 @@ leader: leader key activated +leader: deactivating leader due to timeout leader: leader key deactivated diff --git a/app/tests/leader/two-seq/events.patterns b/app/tests/leader/two-seq/events.patterns index e73813454..9420f41ce 100644 --- a/app/tests/leader/two-seq/events.patterns +++ b/app/tests/leader/two-seq/events.patterns @@ -1,2 +1,3 @@ s/.*hid_listener_keycode_//p s/.*zmk_leader.*:/leader:/p +s/.*leader_key.*:/leader:/p