Skip to content

Commit

Permalink
Apply PR zmkfirmware#1423
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuanbin Shen committed Jun 6, 2023
1 parent a842540 commit 9a975dd
Show file tree
Hide file tree
Showing 21 changed files with 209 additions and 2 deletions.
2 changes: 2 additions & 0 deletions app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ properties:
type: array
required: false
default: []
hold-trigger-on-release:
type: boolean
8 changes: 6 additions & 2 deletions app/src/behaviors/behavior_hold_tap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ struct behavior_hold_tap_config {
bool global_quick_tap;
enum flavor flavor;
bool retro_tap;
bool hold_trigger_on_release;
int32_t hold_trigger_key_positions_len;
int32_t hold_trigger_key_positions[];
};
Expand Down Expand Up @@ -587,9 +588,11 @@ static int position_state_changed_listener(const zmk_event_t *eh) {
}

// Store the position of pressed key for positional hold-tap purposes.
if ((ev->state) // i.e. key pressed (not released)
if ((undecided_hold_tap->config->hold_trigger_on_release !=
ev->state) // key has been pressed and hold_trigger_on_release is not set, or key
// has been released and hold_trigger_on_release is set
&& (undecided_hold_tap->position_of_first_other_key_pressed ==
-1) // i.e. no other key has been pressed yet
-1) // no other key has been pressed yet
) {
undecided_hold_tap->position_of_first_other_key_pressed = ev->position;
}
Expand Down Expand Up @@ -703,6 +706,7 @@ static int behavior_hold_tap_init(const struct device *dev) {
.global_quick_tap = DT_INST_PROP(n, global_quick_tap), \
.flavor = DT_ENUM_IDX(DT_DRV_INST(n), flavor), \
.retro_tap = DT_INST_PROP(n, retro_tap), \
.hold_trigger_on_release = DT_INST_PROP(n, hold_trigger_on_release), \
.hold_trigger_key_positions = DT_INST_PROP(n, hold_trigger_key_positions), \
.hold_trigger_key_positions_len = DT_INST_PROP_LEN(n, hold_trigger_key_positions), \
}; \
Expand Down
4 changes: 4 additions & 0 deletions app/tests/hold-tap/balanced/7-positional/on-release-no-trigger/events.patterns
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
s/.*hid_listener_keycode/kp/p
s/.*mo_keymap_binding/mo/p
s/.*on_hold_tap_binding/ht_binding/p
s/.*decide_hold_tap/ht_decide/p
12 changes: 12 additions & 0 deletions app/tests/hold-tap/balanced/7-positional/on-release-no-trigger/keycode_events.snapshot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ht_binding_pressed: 0 new undecided hold_tap
kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
ht_decide: 0 decided hold-interrupt (balanced decision moment other-key-up)
kp_pressed: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_pressed: 1 new undecided hold_tap
ht_decide: 1 decided tap (balanced decision moment key-up)
kp_pressed: usage_page 0x07 keycode 0x0D implicit_mods 0x00 explicit_mods 0x00
kp_pressed: usage_page 0x07 keycode 0x08 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0x0D implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 1 cleaning up hold-tap
kp_released: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 0 cleaning up hold-tap
17 changes: 17 additions & 0 deletions app/tests/hold-tap/balanced/7-positional/on-release-no-trigger/native_posix_64.keymap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
#include "../behavior_keymap.dtsi"

&ht_bal { hold-trigger-on-release; };

&kscan {
events = <
ZMK_MOCK_PRESS(0,0,10) // mod 1
ZMK_MOCK_PRESS(0,1,10) // mod 2
ZMK_MOCK_PRESS(1,1,10) // not trigger position
ZMK_MOCK_RELEASE(1,0,10)
ZMK_MOCK_RELEASE(0,1,10)
ZMK_MOCK_RELEASE(0,0,10)
>;
};
4 changes: 4 additions & 0 deletions app/tests/hold-tap/balanced/7-positional/on-release-trigger/events.patterns
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
s/.*hid_listener_keycode/kp/p
s/.*mo_keymap_binding/mo/p
s/.*on_hold_tap_binding/ht_binding/p
s/.*decide_hold_tap/ht_decide/p
12 changes: 12 additions & 0 deletions app/tests/hold-tap/balanced/7-positional/on-release-trigger/keycode_events.snapshot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ht_binding_pressed: 0 new undecided hold_tap
ht_decide: 0 decided hold-interrupt (balanced decision moment other-key-up)
kp_pressed: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_pressed: 1 new undecided hold_tap
ht_decide: 1 decided hold-interrupt (balanced decision moment other-key-up)
kp_pressed: usage_page 0x07 keycode 0xE0 implicit_mods 0x00 explicit_mods 0x00
kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0xE0 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 1 cleaning up hold-tap
kp_released: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 0 cleaning up hold-tap
17 changes: 17 additions & 0 deletions app/tests/hold-tap/balanced/7-positional/on-release-trigger/native_posix_64.keymap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
#include "../behavior_keymap.dtsi"

&ht_bal { hold-trigger-on-release; };

&kscan {
events = <
ZMK_MOCK_PRESS(0,0,10) // mod 1
ZMK_MOCK_PRESS(0,1,10) // mod 2
ZMK_MOCK_PRESS(1,0,10) // trigger position
ZMK_MOCK_RELEASE(1,0,10)
ZMK_MOCK_RELEASE(0,1,10)
ZMK_MOCK_RELEASE(0,0,10)
>;
};
4 changes: 4 additions & 0 deletions app/tests/hold-tap/hold-preferred/7-positional/on-release-no-trigger/events.patterns
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
s/.*hid_listener_keycode/kp/p
s/.*mo_keymap_binding/mo/p
s/.*on_hold_tap_binding/ht_binding/p
s/.*decide_hold_tap/ht_decide/p
12 changes: 12 additions & 0 deletions app/tests/hold-tap/hold-preferred/7-positional/on-release-no-trigger/keycode_events.snapshot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ht_binding_pressed: 0 new undecided hold_tap
ht_decide: 0 decided hold-interrupt (hold-preferred decision moment other-key-down)
kp_pressed: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_pressed: 1 new undecided hold_tap
ht_decide: 1 decided hold-interrupt (hold-preferred decision moment other-key-down)
kp_pressed: usage_page 0x07 keycode 0xE0 implicit_mods 0x00 explicit_mods 0x00
kp_pressed: usage_page 0x07 keycode 0x08 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0xE0 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 1 cleaning up hold-tap
kp_released: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 0 cleaning up hold-tap
17 changes: 17 additions & 0 deletions app/tests/hold-tap/hold-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
#include "../behavior_keymap.dtsi"

&ht_hold { hold-trigger-on-release; };

&kscan {
events = <
ZMK_MOCK_PRESS(0,0,10) // mod 1
ZMK_MOCK_PRESS(0,1,10) // mod 2
ZMK_MOCK_PRESS(1,1,10) // not trigger position
ZMK_MOCK_RELEASE(1,0,10)
ZMK_MOCK_RELEASE(0,1,10)
ZMK_MOCK_RELEASE(0,0,10)
>;
};
4 changes: 4 additions & 0 deletions app/tests/hold-tap/hold-preferred/7-positional/on-release-trigger/events.patterns
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
s/.*hid_listener_keycode/kp/p
s/.*mo_keymap_binding/mo/p
s/.*on_hold_tap_binding/ht_binding/p
s/.*decide_hold_tap/ht_decide/p
12 changes: 12 additions & 0 deletions app/tests/hold-tap/hold-preferred/7-positional/on-release-trigger/keycode_events.snapshot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ht_binding_pressed: 0 new undecided hold_tap
ht_decide: 0 decided hold-interrupt (hold-preferred decision moment other-key-down)
kp_pressed: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_pressed: 1 new undecided hold_tap
ht_decide: 1 decided hold-interrupt (hold-preferred decision moment other-key-down)
kp_pressed: usage_page 0x07 keycode 0xE0 implicit_mods 0x00 explicit_mods 0x00
kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0xE0 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 1 cleaning up hold-tap
kp_released: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 0 cleaning up hold-tap
17 changes: 17 additions & 0 deletions app/tests/hold-tap/hold-preferred/7-positional/on-release-trigger/native_posix_64.keymap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
#include "../behavior_keymap.dtsi"

&ht_hold { hold-trigger-on-release; };

&kscan {
events = <
ZMK_MOCK_PRESS(0,0,10) // mod 1
ZMK_MOCK_PRESS(0,1,10) // mod 2
ZMK_MOCK_PRESS(1,0,10) // trigger position
ZMK_MOCK_RELEASE(1,0,10)
ZMK_MOCK_RELEASE(0,1,10)
ZMK_MOCK_RELEASE(0,0,10)
>;
};
4 changes: 4 additions & 0 deletions app/tests/hold-tap/tap-preferred/7-positional/on-release-no-trigger/events.patterns
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
s/.*hid_listener_keycode/kp/p
s/.*mo_keymap_binding/mo/p
s/.*on_hold_tap_binding/ht_binding/p
s/.*decide_hold_tap/ht_decide/p
12 changes: 12 additions & 0 deletions app/tests/hold-tap/tap-preferred/7-positional/on-release-no-trigger/keycode_events.snapshot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ht_binding_pressed: 0 new undecided hold_tap
kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
ht_decide: 0 decided tap (tap-preferred decision moment key-up)
kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
ht_binding_pressed: 1 new undecided hold_tap
ht_decide: 1 decided tap (tap-preferred decision moment key-up)
kp_pressed: usage_page 0x07 keycode 0x0D implicit_mods 0x00 explicit_mods 0x00
kp_pressed: usage_page 0x07 keycode 0x08 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0x0D implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 1 cleaning up hold-tap
kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 0 cleaning up hold-tap
17 changes: 17 additions & 0 deletions app/tests/hold-tap/tap-preferred/7-positional/on-release-no-trigger/native_posix_64.keymap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
#include "../behavior_keymap.dtsi"

&tp { hold-trigger-on-release; };

&kscan {
events = <
ZMK_MOCK_PRESS(0,0,10) // mod 1
ZMK_MOCK_PRESS(0,1,10) // mod 2
ZMK_MOCK_PRESS(1,1,10) // not trigger position
ZMK_MOCK_RELEASE(1,0,10)
ZMK_MOCK_RELEASE(0,1,10)
ZMK_MOCK_RELEASE(0,0,10)
>;
};
4 changes: 4 additions & 0 deletions app/tests/hold-tap/tap-preferred/7-positional/on-release-trigger/events.patterns
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
s/.*hid_listener_keycode/kp/p
s/.*mo_keymap_binding/mo/p
s/.*on_hold_tap_binding/ht_binding/p
s/.*decide_hold_tap/ht_decide/p
12 changes: 12 additions & 0 deletions app/tests/hold-tap/tap-preferred/7-positional/on-release-trigger/keycode_events.snapshot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ht_binding_pressed: 0 new undecided hold_tap
ht_decide: 0 decided tap (tap-preferred decision moment key-up)
kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
ht_binding_pressed: 1 new undecided hold_tap
ht_decide: 1 decided tap (tap-preferred decision moment key-up)
kp_pressed: usage_page 0x07 keycode 0x0D implicit_mods 0x00 explicit_mods 0x00
kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
kp_released: usage_page 0x07 keycode 0x0D implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 1 cleaning up hold-tap
kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
ht_binding_released: 0 cleaning up hold-tap
17 changes: 17 additions & 0 deletions app/tests/hold-tap/tap-preferred/7-positional/on-release-trigger/native_posix_64.keymap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <dt-bindings/zmk/keys.h>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/kscan_mock.h>
#include "../behavior_keymap.dtsi"

&tp { hold-trigger-on-release; };

&kscan {
events = <
ZMK_MOCK_PRESS(0,0,10) // mod 1
ZMK_MOCK_PRESS(0,1,10) // mod 2
ZMK_MOCK_PRESS(1,0,10) // trigger position
ZMK_MOCK_RELEASE(1,0,10)
ZMK_MOCK_RELEASE(0,1,10)
ZMK_MOCK_RELEASE(0,0,10)
>;
};
3 changes: 3 additions & 0 deletions docs/docs/behaviors/hold-tap.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ See the following example, which uses a hold-tap behavior definition, configured
- The sequence `(pht_down, W_down, W_up, pht_up)` produces `W`. The normal hold behavior (LEFT_SHIFT) **is NOT** modified into a tap behavior (Q) by positional hold-tap because the first key pressed after the hold-tap key is the `W key`, which is in position 1, which **IS** included in `hold-trigger-key-positions`.
- If the `LEFT_SHIFT / Q key` is held by itself for longer than `tapping-term-ms`, a hold behavior is produced. This is because positional hold-tap only modifies the behavior of a hold-tap if another key is pressed before the `tapping-term-ms` period expires.

By default, `hold-trigger-key-positions` are evaluated upon the first _key press_ after
the hold-tap. For homerow mods, this is not always ideal, because it prevents combining multiple modifiers unless they are included in `hold-trigger-key-positions`. To overwrite this behavior, one can set `hold-trigger-on-release`. If set to true, the evaluation of `hold-trigger-key-positions` gets delayed until _key release_. This allows combining multiple modifiers when the next key is _held_, while still deciding the hold-tap in favor of a tap when the next key is _tapped_.

### Example Use-Cases

<Tabs
Expand Down

0 comments on commit 9a975dd

Please sign in to comment.