From 45ddd4c2ae6aadfad990a688d1d7e82406f075d8 Mon Sep 17 00:00:00 2001 From: CrossR Date: Tue, 11 Aug 2020 18:07:08 +0100 Subject: [PATCH 01/25] Add very basic, untested, Sofle configuration. --- app/boards/shields/sofle/Kconfig.defconfig | 54 ++++++++++++++++ app/boards/shields/sofle/Kconfig.shield | 8 +++ app/boards/shields/sofle/sofle.conf | 2 + app/boards/shields/sofle/sofle.dtsi | 67 ++++++++++++++++++++ app/boards/shields/sofle/sofle.keymap | 64 +++++++++++++++++++ app/boards/shields/sofle/sofle_left.conf | 2 + app/boards/shields/sofle/sofle_left.overlay | 23 +++++++ app/boards/shields/sofle/sofle_right.conf | 2 + app/boards/shields/sofle/sofle_right.overlay | 26 ++++++++ 9 files changed, 248 insertions(+) create mode 100644 app/boards/shields/sofle/Kconfig.defconfig create mode 100644 app/boards/shields/sofle/Kconfig.shield create mode 100644 app/boards/shields/sofle/sofle.conf create mode 100644 app/boards/shields/sofle/sofle.dtsi create mode 100644 app/boards/shields/sofle/sofle.keymap create mode 100644 app/boards/shields/sofle/sofle_left.conf create mode 100644 app/boards/shields/sofle/sofle_left.overlay create mode 100644 app/boards/shields/sofle/sofle_right.conf create mode 100644 app/boards/shields/sofle/sofle_right.overlay diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig new file mode 100644 index 00000000..44378686 --- /dev/null +++ b/app/boards/shields/sofle/Kconfig.defconfig @@ -0,0 +1,54 @@ + +if SHIELD_SOFLE_LEFT + +config ZMK_KEYBOARD_NAME + default "Sofle Left" + +endif + +if SHIELD_SOFLE_RIGHT + +config ZMK_KEYBOARD_NAME + default "Sofle Right" + +endif + +if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT + +if ZMK_DISPLAY + +config I2C + default y + +config SSD1306 + default y + +config SSD1306_REVERSE_MODE + default y + +endif # ZMK_DISPLAY + +if LVGL + +config LVGL_HOR_RES + default 128 + +config LVGL_VER_RES + default 32 + +config LVGL_VDB_SIZE + default 64 + +config LVGL_DPI + default 148 + +config LVGL_BITS_PER_PIXEL + default 1 + +choice LVGL_COLOR_DEPTH + default LVGL_COLOR_DEPTH_1 +endchoice + +endif # LVGL + +endif diff --git a/app/boards/shields/sofle/Kconfig.shield b/app/boards/shields/sofle/Kconfig.shield new file mode 100644 index 00000000..d8d5d759 --- /dev/null +++ b/app/boards/shields/sofle/Kconfig.shield @@ -0,0 +1,8 @@ +# Copyright (c) 2020 Pete Johanson +# SPDX-License-Identifier: MIT + +config SHIELD_SOFLE_LEFT + def_bool $(shields_list_contains,sofle_left) + +config SHIELD_SOFLE_RIGHT + def_bool $(shields_list_contains,sofle_right) diff --git a/app/boards/shields/sofle/sofle.conf b/app/boards/shields/sofle/sofle.conf new file mode 100644 index 00000000..60c20dcf --- /dev/null +++ b/app/boards/shields/sofle/sofle.conf @@ -0,0 +1,2 @@ +# Uncomment the following line to enable the Sofle OLED Display +# CONFIG_ZMK_DISPLAY=y diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi new file mode 100644 index 00000000..dfa001c3 --- /dev/null +++ b/app/boards/shields/sofle/sofle.dtsi @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <16>; + rows = <4>; +// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | +// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | +// | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | +// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | +// | SW29 | SW28 | SW27 | SW26 | SW25 | | SW25 | SW26 | SW27 | SW28 | SW29 | + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) +RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) + RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + }; +}; + +&pro_micro_i2c { + status = "okay"; + + ssd1306@3c { + compatible = "solomon,ssd1306fb"; + reg = <0x3c>; + label = "DISPLAY"; + width = <128>; + height = <32>; + segment-offset = <0>; + page-offset = <0>; + display-offset = <0>; + multiplex-ratio = <31>; + segment-remap; + com-invdir; + com-sequential; + prechargep = <0x22>; + }; +}; diff --git a/app/boards/shields/sofle/sofle.keymap b/app/boards/shields/sofle/sofle.keymap new file mode 100644 index 00000000..45c20cb1 --- /dev/null +++ b/app/boards/shields/sofle/sofle.keymap @@ -0,0 +1,64 @@ +#include +#include + +//TODO: Is the encoder stuff needed on every single layer? + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { +// ------------------------------------------------------------------------------------------------------------ +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | +// | ESC | Q | W | E | R | T | | Y | U | I | O | P | Bkspc | +// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | +// | SHIFT | Z | X | C | V | B | | N | M | , | . | / | SHIFT | +// | GUI | ALT | CTRL | LOWER| ENTER | | SPACE | RAISE| CTRL | ALT | GUI | + bindings = < +&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp GRAV +&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BKSP +&kp LCTL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT +&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT + &kp LGUI &kp LALT &kp LCTL &mo 1 &kp RET &kp SPC &mo 2 &kp RCTL &kp RALT &kp RGUI + >; + + sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; + }; + + lower_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | +// | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | +// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | | +// | | = | - | + | { | } | | [ | ] | ; | : | \ | | +// | | | | | | | | | | | | + bindings = < +&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 +&trans &kp 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp F12 +&kp TAB &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp PIPE +&trans &kp EQL &kp MINUS &kp KPLS &kp LCUR &kp RCUR &kp LBKT &kp RKBT &kp SCLN &kp COLN &kp BSLH &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + >; + + sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; + }; + + raise_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | +// | F7 | F8 | F9 | F10 | F11 | F12 | | + | - | = | [ | ] | \ | +// | | | | | | | | | | | | + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &trans +&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &trans &kp LARW &kp UARW &kp DARW & RARW &trans +&kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp KPLS &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + >; + }; + + sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; + }; +}; diff --git a/app/boards/shields/sofle/sofle_left.conf b/app/boards/shields/sofle/sofle_left.conf new file mode 100644 index 00000000..e51dee44 --- /dev/null +++ b/app/boards/shields/sofle/sofle_left.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y \ No newline at end of file diff --git a/app/boards/shields/sofle/sofle_left.overlay b/app/boards/shields/sofle/sofle_left.overlay new file mode 100644 index 00000000..bcfb5588 --- /dev/null +++ b/app/boards/shields/sofle/sofle_left.overlay @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "sofle.dtsi" + +&kscan0 { + col-gpios + = <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 10 GPIO_ACTIVE_HIGH> + ; +}; + +&left_encoder { + status = "okay"; +}; + diff --git a/app/boards/shields/sofle/sofle_right.conf b/app/boards/shields/sofle/sofle_right.conf new file mode 100644 index 00000000..990cf7c0 --- /dev/null +++ b/app/boards/shields/sofle/sofle_right.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/app/boards/shields/sofle/sofle_right.overlay b/app/boards/shields/sofle/sofle_right.overlay new file mode 100644 index 00000000..133f9267 --- /dev/null +++ b/app/boards/shields/sofle/sofle_right.overlay @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "sofle.dtsi" + +&default_transform { + col-offset = <6>; +}; + +&kscan0 { + col-gpios + = <&pro_micro_d 10 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + ; +}; + +&right_encoder { + status = "okay"; +}; From 892394d9e6b795f3f7c60e5e4d433760b5fc64ed Mon Sep 17 00:00:00 2001 From: CrossR Date: Sun, 16 Aug 2020 12:44:18 +0100 Subject: [PATCH 02/25] Update to include missing encoder config. --- app/boards/shields/sofle/Kconfig.defconfig | 2 -- app/boards/shields/sofle/sofle.conf | 4 ++++ app/boards/shields/sofle/sofle.dtsi | 25 +++++++++++++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig index 44378686..2ccf1473 100644 --- a/app/boards/shields/sofle/Kconfig.defconfig +++ b/app/boards/shields/sofle/Kconfig.defconfig @@ -3,14 +3,12 @@ if SHIELD_SOFLE_LEFT config ZMK_KEYBOARD_NAME default "Sofle Left" - endif if SHIELD_SOFLE_RIGHT config ZMK_KEYBOARD_NAME default "Sofle Right" - endif if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT diff --git a/app/boards/shields/sofle/sofle.conf b/app/boards/shields/sofle/sofle.conf index 60c20dcf..2194add9 100644 --- a/app/boards/shields/sofle/sofle.conf +++ b/app/boards/shields/sofle/sofle.conf @@ -1,2 +1,6 @@ # Uncomment the following line to enable the Sofle OLED Display # CONFIG_ZMK_DISPLAY=y + +# Uncomment these two lines to add support for encoders +# CONFIG_EC11=y +# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi index dfa001c3..cfd7a956 100644 --- a/app/boards/shields/sofle/sofle.dtsi +++ b/app/boards/shields/sofle/sofle.dtsi @@ -42,7 +42,30 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; - + }; + + // TODO: Check these pins! + left_encoder: encoder_left { + compatible = "alps,ec11"; + label = "LEFT_ENCODER"; + a-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; + + right_encoder: encoder_right { + compatible = "alps,ec11"; + label = "RIGHT_ENCODER"; + a-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; + + sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&left_encoder &right_encoder>; }; }; From eff6934066e0d898c6dcf3e450d6381073d2bdef Mon Sep 17 00:00:00 2001 From: CrossR Date: Sun, 16 Aug 2020 19:15:47 +0100 Subject: [PATCH 03/25] Update pins. --- app/boards/shields/sofle/sofle.dtsi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi index cfd7a956..4c220a2f 100644 --- a/app/boards/shields/sofle/sofle.dtsi +++ b/app/boards/shields/sofle/sofle.dtsi @@ -44,22 +44,23 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) ; }; - // TODO: Check these pins! + // TODO: Check these pins and resolution! + left_encoder: encoder_left { compatible = "alps,ec11"; label = "LEFT_ENCODER"; - a-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <4>; + a-gpios = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <2>; status = "disabled"; }; right_encoder: encoder_right { compatible = "alps,ec11"; label = "RIGHT_ENCODER"; - a-gpios = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <4>; + a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <2>; status = "disabled"; }; From aa187a54d475b6ac6fe8c78f9365332465ed3029 Mon Sep 17 00:00:00 2001 From: CrossR Date: Wed, 19 Aug 2020 20:18:27 +0100 Subject: [PATCH 04/25] Fix keymap. --- app/boards/shields/sofle/sofle.dtsi | 18 ++++----- app/boards/shields/sofle/sofle.keymap | 56 +++++++++++++-------------- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi index 4c220a2f..d6f29d30 100644 --- a/app/boards/shields/sofle/sofle.dtsi +++ b/app/boards/shields/sofle/sofle.dtsi @@ -19,14 +19,14 @@ // | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | // | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | -// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | -// | SW29 | SW28 | SW27 | SW26 | SW25 | | SW25 | SW26 | SW27 | SW28 | SW29 | +// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 | | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | +// | SW30 | SW29 | SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | SW29 | SW30 | map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) -RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) - RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,9) RC(4,10) RC(4,11) RC(4,12) RC(4,13) +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) +RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) + RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) >; }; @@ -49,7 +49,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) left_encoder: encoder_left { compatible = "alps,ec11"; label = "LEFT_ENCODER"; - a-gpios = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + a-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; b-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; resolution = <2>; status = "disabled"; @@ -59,7 +59,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) compatible = "alps,ec11"; label = "RIGHT_ENCODER"; a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; resolution = <2>; status = "disabled"; }; diff --git a/app/boards/shields/sofle/sofle.keymap b/app/boards/shields/sofle/sofle.keymap index 45c20cb1..02f4560a 100644 --- a/app/boards/shields/sofle/sofle.keymap +++ b/app/boards/shields/sofle/sofle.keymap @@ -1,25 +1,23 @@ #include #include -//TODO: Is the encoder stuff needed on every single layer? - / { keymap { compatible = "zmk,keymap"; default_layer { // ------------------------------------------------------------------------------------------------------------ -// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | -// | ESC | Q | W | E | R | T | | Y | U | I | O | P | Bkspc | -// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | -// | SHIFT | Z | X | C | V | B | | N | M | , | . | / | SHIFT | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | ESC | Q | W | E | R | T | | Y | U | I | O | P | BKSPC | +// | TAB | A | S | D | F | G | | H | J | K | L | ; | ' | +// | SHIFT | Z | X | C | V | B | MUTE | | | N | M | , | . | / | SHIFT | // | GUI | ALT | CTRL | LOWER| ENTER | | SPACE | RAISE| CTRL | ALT | GUI | bindings = < -&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp GRAV -&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BKSP -&kp LCTL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT -&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT - &kp LGUI &kp LALT &kp LCTL &mo 1 &kp RET &kp SPC &mo 2 &kp RCTL &kp RALT &kp RGUI +&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &none +&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BKSP +&kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT +&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp M_MUTE &none &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT + &kp LGUI &kp LALT &kp LCTL &mo 1 &kp RET &kp SPC &mo 2 &kp RCTL &kp RALT &kp RGUI >; sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; @@ -28,16 +26,16 @@ lower_layer { // ------------------------------------------------------------------------------------------------------------ // | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | -// | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | -// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | | -// | | = | - | + | { | } | | [ | ] | ; | : | \ | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | +// | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | | +// | | = | - | + | { | } | | | | [ | ] | ; | : | \ | | // | | | | | | | | | | | | bindings = < -&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 -&trans &kp 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp F12 -&kp TAB &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp PIPE -&trans &kp EQL &kp MINUS &kp KPLS &kp LCUR &kp RCUR &kp LBKT &kp RKBT &kp SCLN &kp COLN &kp BSLH &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 +&kp GRAV &kp 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp F12 +&trans &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp PIPE +&trans &kp EQL &kp MINUS &kp KPLS &kp LCUR &kp RCUR &trans &trans &kp LBKT &kp RKBT &kp SCLN &kp COLN &kp BSLH &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; @@ -45,17 +43,17 @@ raise_layer { // ------------------------------------------------------------------------------------------------------------ -// | | | | | | | | | | | | | | -// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | -// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | -// | F7 | F8 | F9 | F10 | F11 | F12 | | + | - | = | [ | ] | \ | -// | | | | | | | | | | | | +// | | | | | | | | | | | | | | +// | | INS | PSCR | GUI | | | | PGUP | | ^ | | | | +// | | ALT | CTRL | SHIFT | | CAPS | | PGDN | <- | v | -> | DEL | BKSPC | +// | | UNDO | CUT | COPY | PASTE | | | | | | | | | | | +// | | | | | | | | | | | | bindings = < -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &trans -&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &trans &kp LARW &kp UARW &kp DARW & RARW &trans -&kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp KPLS &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &kp INS &kp PRSC &kp GUI &trans &trans &kp PGUP &trans &kp UARW &trans &kp NUM_0 &trans +&trans &kp LALT &kp LCTL &kp LSFT &trans &kp CLCK &kp PGDN &kp LARW &kp DARW &kp RARW &kp DEL &kp BKSP +&trans &kp 0x7A &kp 0x7B &kp 0x7C &kp 0x7D &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; }; From dcd36f12e049ee2c423204ebaaa3c16062d9fd5e Mon Sep 17 00:00:00 2001 From: CrossR Date: Wed, 19 Aug 2020 20:53:22 +0100 Subject: [PATCH 05/25] Add BT clear bind. Should check the positions are correct. --- app/boards/shields/sofle/sofle.dtsi | 122 ++++++++++--------- app/boards/shields/sofle/sofle_left.conf | 3 +- app/boards/shields/sofle/sofle_left.overlay | 3 + app/boards/shields/sofle/sofle_right.conf | 1 + app/boards/shields/sofle/sofle_right.overlay | 4 + 5 files changed, 72 insertions(+), 61 deletions(-) diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi index d6f29d30..1a5ea84b 100644 --- a/app/boards/shields/sofle/sofle.dtsi +++ b/app/boards/shields/sofle/sofle.dtsi @@ -7,85 +7,87 @@ #include / { - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <16>; - rows = <4>; + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <16>; + rows = <4>; // | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | // | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | // | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | // | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 | | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | // | SW30 | SW29 | SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | SW29 | SW30 | - map = < + map = < RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11) - >; - }; + >; + }; - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; - diode-direction = "col2row"; - row-gpios - = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - }; + diode-direction = "col2row"; + row-gpios + = <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; - // TODO: Check these pins and resolution! + left_encoder: encoder_left { + compatible = "alps,ec11"; + label = "LEFT_ENCODER"; + a-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <2>; + status = "disabled"; + }; - left_encoder: encoder_left { - compatible = "alps,ec11"; - label = "LEFT_ENCODER"; - a-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <2>; - status = "disabled"; - }; + right_encoder: encoder_right { + compatible = "alps,ec11"; + label = "RIGHT_ENCODER"; + a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <2>; + status = "disabled"; + }; - right_encoder: encoder_right { - compatible = "alps,ec11"; - label = "RIGHT_ENCODER"; - a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <2>; - status = "disabled"; - }; + sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&left_encoder &right_encoder>; + }; - sensors { - compatible = "zmk,keymap-sensors"; - sensors = <&left_encoder &right_encoder>; - }; + bt_unpair_combo: bt_unpair_combo { + compatible = "zmk,bt-unpair-combo"; + }; }; &pro_micro_i2c { - status = "okay"; + status = "okay"; - ssd1306@3c { - compatible = "solomon,ssd1306fb"; - reg = <0x3c>; - label = "DISPLAY"; - width = <128>; - height = <32>; - segment-offset = <0>; - page-offset = <0>; - display-offset = <0>; - multiplex-ratio = <31>; - segment-remap; - com-invdir; - com-sequential; - prechargep = <0x22>; - }; + ssd1306@3c { + compatible = "solomon,ssd1306fb"; + reg = <0x3c>; + label = "DISPLAY"; + width = <128>; + height = <32>; + segment-offset = <0>; + page-offset = <0>; + display-offset = <0>; + multiplex-ratio = <31>; + segment-remap; + com-invdir; + com-sequential; + prechargep = <0x22>; + }; }; diff --git a/app/boards/shields/sofle/sofle_left.conf b/app/boards/shields/sofle/sofle_left.conf index e51dee44..d2d1e3cf 100644 --- a/app/boards/shields/sofle/sofle_left.conf +++ b/app/boards/shields/sofle/sofle_left.conf @@ -1,2 +1,3 @@ CONFIG_ZMK_SPLIT=y -CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y \ No newline at end of file +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y +CONFIG_ZMK_BLE_UNPAIR_COMBO=y diff --git a/app/boards/shields/sofle/sofle_left.overlay b/app/boards/shields/sofle/sofle_left.overlay index bcfb5588..f6719dd0 100644 --- a/app/boards/shields/sofle/sofle_left.overlay +++ b/app/boards/shields/sofle/sofle_left.overlay @@ -21,3 +21,6 @@ status = "okay"; }; +&bt_unpair_combo { + key-positions = <0 52>; +}; diff --git a/app/boards/shields/sofle/sofle_right.conf b/app/boards/shields/sofle/sofle_right.conf index 990cf7c0..cf16779e 100644 --- a/app/boards/shields/sofle/sofle_right.conf +++ b/app/boards/shields/sofle/sofle_right.conf @@ -1,2 +1,3 @@ CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y +CONFIG_ZMK_BLE_UNPAIR_COMBO=y diff --git a/app/boards/shields/sofle/sofle_right.overlay b/app/boards/shields/sofle/sofle_right.overlay index 133f9267..ee1a606d 100644 --- a/app/boards/shields/sofle/sofle_right.overlay +++ b/app/boards/shields/sofle/sofle_right.overlay @@ -24,3 +24,7 @@ &right_encoder { status = "okay"; }; + +&bt_unpair_combo { + key-positions = <11 55>; +}; From 0d7bf03158b6c49c6db65732dd086820bc4fc64b Mon Sep 17 00:00:00 2001 From: CrossR Date: Wed, 19 Aug 2020 21:52:31 +0100 Subject: [PATCH 06/25] Fix BT unpair combo. --- app/boards/shields/sofle/sofle_left.overlay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/sofle/sofle_left.overlay b/app/boards/shields/sofle/sofle_left.overlay index f6719dd0..9dfe52d6 100644 --- a/app/boards/shields/sofle/sofle_left.overlay +++ b/app/boards/shields/sofle/sofle_left.overlay @@ -22,5 +22,5 @@ }; &bt_unpair_combo { - key-positions = <0 52>; + key-positions = <0 54>; }; From d4e8312db6766b8fb4c8b76e14a4be9225d918a7 Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 21 Aug 2020 17:08:43 +0100 Subject: [PATCH 07/25] Mute is a consumer keypress. --- app/boards/shields/sofle/sofle.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/sofle/sofle.keymap b/app/boards/shields/sofle/sofle.keymap index 02f4560a..1d7dab0d 100644 --- a/app/boards/shields/sofle/sofle.keymap +++ b/app/boards/shields/sofle/sofle.keymap @@ -16,7 +16,7 @@ &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &none &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BKSP &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT -&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp M_MUTE &none &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT +&kp LSFT &kp Z &kp X &kp C &kp V &kp B &cp M_MUTE &none &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT &kp LGUI &kp LALT &kp LCTL &mo 1 &kp RET &kp SPC &mo 2 &kp RCTL &kp RALT &kp RGUI >; From 5c29259fedc4a0265064afc0bc141e6bf33425f2 Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 21 Aug 2020 17:10:29 +0100 Subject: [PATCH 08/25] Remove unpair combo config option. --- app/boards/shields/sofle/sofle_left.conf | 1 - app/boards/shields/sofle/sofle_right.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/app/boards/shields/sofle/sofle_left.conf b/app/boards/shields/sofle/sofle_left.conf index d2d1e3cf..1e028a78 100644 --- a/app/boards/shields/sofle/sofle_left.conf +++ b/app/boards/shields/sofle/sofle_left.conf @@ -1,3 +1,2 @@ CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y -CONFIG_ZMK_BLE_UNPAIR_COMBO=y diff --git a/app/boards/shields/sofle/sofle_right.conf b/app/boards/shields/sofle/sofle_right.conf index cf16779e..990cf7c0 100644 --- a/app/boards/shields/sofle/sofle_right.conf +++ b/app/boards/shields/sofle/sofle_right.conf @@ -1,3 +1,2 @@ CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y -CONFIG_ZMK_BLE_UNPAIR_COMBO=y From d848034c81ff3dea95a6ca98c0b05c76971647eb Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 21 Aug 2020 22:15:27 +0100 Subject: [PATCH 09/25] Add keycodes properly. --- app/boards/shields/sofle/sofle.keymap | 2 +- app/include/dt-bindings/zmk/keys.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/boards/shields/sofle/sofle.keymap b/app/boards/shields/sofle/sofle.keymap index 1d7dab0d..f3b276ba 100644 --- a/app/boards/shields/sofle/sofle.keymap +++ b/app/boards/shields/sofle/sofle.keymap @@ -52,7 +52,7 @@ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp INS &kp PRSC &kp GUI &trans &trans &kp PGUP &trans &kp UARW &trans &kp NUM_0 &trans &trans &kp LALT &kp LCTL &kp LSFT &trans &kp CLCK &kp PGDN &kp LARW &kp DARW &kp RARW &kp DEL &kp BKSP -&trans &kp 0x7A &kp 0x7B &kp 0x7C &kp 0x7D &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &kp UNDO &kp CUT &kp COPY &kp PSTE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; }; diff --git a/app/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h index 0a528572..cd9261d9 100644 --- a/app/include/dt-bindings/zmk/keys.h +++ b/app/include/dt-bindings/zmk/keys.h @@ -92,6 +92,11 @@ #define GUI 0x65 +#define UNDO 0x7A +#define CUT 0x7B +#define COPY 0x7C +#define PSTE 0x7D + #define CURU 0xB4 #define LPRN 0xB6 From 796b2dddd98cceae8b6243e61b7c1869929ede8a Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 21 Aug 2020 22:41:57 +0100 Subject: [PATCH 10/25] Remove erroneous key. --- app/boards/shields/sofle/sofle.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/shields/sofle/sofle.keymap b/app/boards/shields/sofle/sofle.keymap index f3b276ba..b3bf74e9 100644 --- a/app/boards/shields/sofle/sofle.keymap +++ b/app/boards/shields/sofle/sofle.keymap @@ -35,7 +35,7 @@ &kp GRAV &kp 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp F12 &trans &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp PIPE &trans &kp EQL &kp MINUS &kp KPLS &kp LCUR &kp RCUR &trans &trans &kp LBKT &kp RKBT &kp SCLN &kp COLN &kp BSLH &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; @@ -55,8 +55,8 @@ &trans &kp UNDO &kp CUT &kp COPY &kp PSTE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; - }; sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; + }; }; }; From c84516bfcfa7e578bd7d30ab6426550b6834ab2d Mon Sep 17 00:00:00 2001 From: CrossR Date: Sat, 22 Aug 2020 09:51:01 +0100 Subject: [PATCH 11/25] Fix PR issues. --- app/boards/shields/sofle/Kconfig.shield | 2 +- app/boards/shields/sofle/sofle.dtsi | 2 +- app/boards/shields/sofle/sofle.keymap | 11 ++++++----- app/boards/shields/sofle/sofle_left.overlay | 2 +- app/boards/shields/sofle/sofle_right.overlay | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/boards/shields/sofle/Kconfig.shield b/app/boards/shields/sofle/Kconfig.shield index d8d5d759..e23a97a1 100644 --- a/app/boards/shields/sofle/Kconfig.shield +++ b/app/boards/shields/sofle/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Pete Johanson +# Copyright (c) 2020 Ryan Cross # SPDX-License-Identifier: MIT config SHIELD_SOFLE_LEFT diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi index 1a5ea84b..9b3d3c06 100644 --- a/app/boards/shields/sofle/sofle.dtsi +++ b/app/boards/shields/sofle/sofle.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2020 Pete Johanson, Ryan Cross * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/sofle/sofle.keymap b/app/boards/shields/sofle/sofle.keymap index b3bf74e9..aadffa1f 100644 --- a/app/boards/shields/sofle/sofle.keymap +++ b/app/boards/shields/sofle/sofle.keymap @@ -24,6 +24,7 @@ }; lower_layer { +// TODO: Some binds are waiting for shifted keycode support. // ------------------------------------------------------------------------------------------------------------ // | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | // | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | @@ -31,11 +32,11 @@ // | | = | - | + | { | } | | | | [ | ] | ; | : | \ | | // | | | | | | | | | | | | bindings = < -&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 -&kp GRAV &kp 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp F12 -&trans &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp PIPE -&trans &kp EQL &kp MINUS &kp KPLS &kp LCUR &kp RCUR &trans &trans &kp LBKT &kp RKBT &kp SCLN &kp COLN &kp BSLH &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 +&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp F12 +&trans &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp PIPE +&trans &kp EQL &kp MINUS &kp KPLS &kp LCUR &kp RCUR &trans &trans &kp LBKT &kp RBKT &kp SCLN &kp COLN &kp BSLH &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; sensor-bindings = <&inc_dec_cp M_VOLU M_VOLD &inc_dec_kp PGUP PGDN>; diff --git a/app/boards/shields/sofle/sofle_left.overlay b/app/boards/shields/sofle/sofle_left.overlay index 9dfe52d6..0dfb7535 100644 --- a/app/boards/shields/sofle/sofle_left.overlay +++ b/app/boards/shields/sofle/sofle_left.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2020 Ryan Cross * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/sofle/sofle_right.overlay b/app/boards/shields/sofle/sofle_right.overlay index ee1a606d..8eaf076d 100644 --- a/app/boards/shields/sofle/sofle_right.overlay +++ b/app/boards/shields/sofle/sofle_right.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2020 Ryan Cross * * SPDX-License-Identifier: MIT */ From 7abcae6949834a4dd9d4fdb41ebc68acb36d3db7 Mon Sep 17 00:00:00 2001 From: CrossR Date: Sun, 23 Aug 2020 18:48:28 +0100 Subject: [PATCH 12/25] Update License info. --- app/boards/shields/sofle/Kconfig.defconfig | 2 ++ app/boards/shields/sofle/sofle.conf | 3 +++ app/boards/shields/sofle/sofle_left.conf | 3 +++ app/boards/shields/sofle/sofle_right.conf | 3 +++ 4 files changed, 11 insertions(+) diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig index 2ccf1473..58d82176 100644 --- a/app/boards/shields/sofle/Kconfig.defconfig +++ b/app/boards/shields/sofle/Kconfig.defconfig @@ -1,3 +1,5 @@ +# Copyright (c) 2020 Ryan Cross +# SPDX-License-Identifier: MIT if SHIELD_SOFLE_LEFT diff --git a/app/boards/shields/sofle/sofle.conf b/app/boards/shields/sofle/sofle.conf index 2194add9..fe3f0f4f 100644 --- a/app/boards/shields/sofle/sofle.conf +++ b/app/boards/shields/sofle/sofle.conf @@ -1,3 +1,6 @@ +# Copyright (c) 2020 Ryan Cross +# SPDX-License-Identifier: MIT + # Uncomment the following line to enable the Sofle OLED Display # CONFIG_ZMK_DISPLAY=y diff --git a/app/boards/shields/sofle/sofle_left.conf b/app/boards/shields/sofle/sofle_left.conf index 1e028a78..bbac7359 100644 --- a/app/boards/shields/sofle/sofle_left.conf +++ b/app/boards/shields/sofle/sofle_left.conf @@ -1,2 +1,5 @@ +# Copyright (c) 2020 Ryan Cross +# SPDX-License-Identifier: MIT + CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/app/boards/shields/sofle/sofle_right.conf b/app/boards/shields/sofle/sofle_right.conf index 990cf7c0..ca5de382 100644 --- a/app/boards/shields/sofle/sofle_right.conf +++ b/app/boards/shields/sofle/sofle_right.conf @@ -1,2 +1,5 @@ +# Copyright (c) 2020 Ryan Cross +# SPDX-License-Identifier: MIT + CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y From 96fde775604be02f2aeee04f3cd6d4edff2815bd Mon Sep 17 00:00:00 2001 From: Kurtis Lew Date: Sun, 30 Aug 2020 20:12:53 -0700 Subject: [PATCH 13/25] Update key-press.md Specified keypress and consumer press pages --- docs/docs/behavior/key-press.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/behavior/key-press.md b/docs/docs/behavior/key-press.md index 2edce1d3..f58225d7 100644 --- a/docs/docs/behavior/key-press.md +++ b/docs/docs/behavior/key-press.md @@ -8,7 +8,7 @@ sidebar_label: Key Press The most basic of behaviors, is the ability to send certain keycode presses and releases in response to activating a certain key. -For reference on keycode values, see the [USB HID Usage Tables](https://www.usb.org/document-library/hid-usage-tables-12). +For reference on keycode values, see pages 83-89 of the [USB HID Usage Tables](https://www.usb.org/document-library/hid-usage-tables-12). ## Keycode Defines From 21fcab208e50bf8ccbe9e238662ca86c35dab077 Mon Sep 17 00:00:00 2001 From: Okke Formsma Date: Mon, 31 Aug 2020 22:24:36 +0200 Subject: [PATCH 14/25] stop on fatal errors --- app/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 9fce3b64..db56c538 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -56,3 +56,5 @@ target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c) target_sources(app PRIVATE src/endpoints.c) target_sources(app PRIVATE src/hid_listener.c) target_sources(app PRIVATE src/main.c) + +zephyr_cc_option(-Wfatal-errors) \ No newline at end of file From 639a338c2dd6801ae8fa4d82c9d7101405b2dc7b Mon Sep 17 00:00:00 2001 From: Cody McGinnis Date: Tue, 1 Sep 2020 09:34:06 -0400 Subject: [PATCH 15/25] fix(core): track layer state with keypress --- app/src/keymap.c | 56 ++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/app/src/keymap.c b/app/src/keymap.c index ee6e370d..57cdad6e 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -51,10 +51,10 @@ static u8_t zmk_keymap_layer_default = 0; // State -// When a behavior handles a key position "down" event, we record that layer +// When a behavior handles a key position "down" event, we record the layer state // here so that even if that layer is deactivated before the "up", event, we // still send the release event to the behavior in that layer also. -static u8_t zmk_keymap_active_behavior_layer[ZMK_KEYMAP_LEN]; +static u32_t zmk_keymap_active_behavior_layer[ZMK_KEYMAP_LEN]; static struct zmk_behavior_binding zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_KEYMAP_LEN] = { DT_INST_FOREACH_CHILD(0, TRANSFORMED_LAYER) @@ -101,47 +101,51 @@ int zmk_keymap_layer_toggle(u8_t layer) return zmk_keymap_layer_activate(layer); }; -bool is_active_position(u32_t position, u8_t layer) +bool is_active_layer(u8_t layer, u32_t layer_state) { - return (zmk_keymap_layer_state & BIT(layer)) == BIT(layer) - || layer == zmk_keymap_layer_default - || zmk_keymap_active_behavior_layer[position] == layer; + return (layer_state & BIT(layer)) == BIT(layer) + || layer == zmk_keymap_layer_default; } +int zmk_keymap_apply_position_state(int layer, u32_t position, bool pressed) +{ + struct zmk_behavior_binding *binding = &zmk_keymap[layer][position]; + struct device *behavior; + + LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, log_strdup(binding->behavior_dev)); + + behavior = device_get_binding(binding->behavior_dev); + + if (!behavior) { + LOG_DBG("No behavior assigned to %d on layer %d", position, layer); + return 1; + } + + if (pressed) { + return behavior_keymap_binding_pressed(behavior, position, binding->param1, binding->param2); + } else { + return behavior_keymap_binding_released(behavior, position, binding->param1, binding->param2); + } +} + int zmk_keymap_position_state_changed(u32_t position, bool pressed) { for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= zmk_keymap_layer_default; layer--) { - if (is_active_position(position, layer)) + u32_t layer_state = pressed ? zmk_keymap_layer_state : zmk_keymap_active_behavior_layer[position]; + if (is_active_layer(layer, layer_state)) { - struct zmk_behavior_binding *binding = &zmk_keymap[layer][position]; - struct device *behavior; - int ret; - - LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, log_strdup(binding->behavior_dev)); + int ret = zmk_keymap_apply_position_state(layer, position, pressed); - behavior = device_get_binding(binding->behavior_dev); - - if (!behavior) { - LOG_DBG("No behavior assigned to %d on layer %d", position, layer); - continue; - } - if (pressed) { - ret = behavior_keymap_binding_pressed(behavior, position, binding->param1, binding->param2); - } else { - ret = behavior_keymap_binding_released(behavior, position, binding->param1, binding->param2); - } - + zmk_keymap_active_behavior_layer[position] = zmk_keymap_layer_state; if (ret > 0) { LOG_DBG("behavior processing to continue to next layer"); continue; } else if (ret < 0) { LOG_DBG("Behavior returned error: %d", ret); - zmk_keymap_active_behavior_layer[position] = 0; return ret; } else { - zmk_keymap_active_behavior_layer[position] = pressed ? layer : 0; return ret; } } From 01db53b46a6eaf3126e0b44e2f3fc18fd4ae0114 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 1 Sep 2020 09:55:25 -0400 Subject: [PATCH 16/25] fix(kscan): Avoid sending duplicate kscan events. --- app/drivers/zephyr/kscan_gpio_direct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/drivers/zephyr/kscan_gpio_direct.c b/app/drivers/zephyr/kscan_gpio_direct.c index 6e0beb01..a3aa8c46 100644 --- a/app/drivers/zephyr/kscan_gpio_direct.c +++ b/app/drivers/zephyr/kscan_gpio_direct.c @@ -156,7 +156,6 @@ static int kscan_gpio_read(struct device *dev) struct kscan_gpio_data *data = dev->driver_data; const struct kscan_gpio_config *cfg = dev->config_info; u32_t read_state = data->pin_state; - LOG_DBG("Scanning the pins for updated state"); for (int i = 0; i < cfg->num_of_inputs; i++) { struct device *in_dev = kscan_gpio_input_devices(dev)[i]; @@ -165,8 +164,9 @@ static int kscan_gpio_read(struct device *dev) } for (int i = 0; i < cfg->num_of_inputs; i++) { + bool prev_pressed = BIT(i) & data->pin_state; bool pressed = BIT(i) & read_state; - if (pressed != (BIT(i) & data->pin_state)) + if (pressed != prev_pressed) { LOG_DBG("Sending event at %d,%d state %s", 0, i, (pressed ? "on" : "off")); From ca0f2bb074a103b871a3e0f7f5e1fed8b6b4069b Mon Sep 17 00:00:00 2001 From: CrossR Date: Tue, 1 Sep 2020 18:32:45 +0100 Subject: [PATCH 17/25] Add to setup. --- app/boards/shields/sofle/sofle.dtsi | 14 ++++++-------- docs/static/setup.sh | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/boards/shields/sofle/sofle.dtsi b/app/boards/shields/sofle/sofle.dtsi index 9b3d3c06..653a772a 100644 --- a/app/boards/shields/sofle/sofle.dtsi +++ b/app/boards/shields/sofle/sofle.dtsi @@ -47,19 +47,17 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) left_encoder: encoder_left { compatible = "alps,ec11"; label = "LEFT_ENCODER"; - a-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <2>; - status = "disabled"; + a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; }; right_encoder: encoder_right { compatible = "alps,ec11"; label = "RIGHT_ENCODER"; - a-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <2>; - status = "disabled"; + a-gpios = <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; }; sensors { diff --git a/docs/static/setup.sh b/docs/static/setup.sh index 4dc740a7..a32718d5 100644 --- a/docs/static/setup.sh +++ b/docs/static/setup.sh @@ -38,7 +38,7 @@ echo "" echo "Keyboard Shield Selection:" prompt="Pick an keyboard:" -options=("Kyria" "Lily58" "Corne" "Splitreus62") +options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle") PS3="$prompt " # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos. @@ -51,6 +51,7 @@ select opt in "${options[@]}" "Quit"; do 2 ) shield_title="Lily58" shield="lily58"; split="y"; break;; 3 ) shield_title="Corne" shield="corne"; split="y"; break;; 4 ) shield_title="Splitreus62" shield="splitreus62"; split="y"; break;; + 5 ) shield_title="Sofle" shield="sofle"; split="y"; break;; # Add link to docs on adding your own custom shield in your ZMK config! # $(( ${#options[@]}+1 )) ) echo "Other!"; break;; From c33931c72c179d19028b2d70ec043cbc3d786137 Mon Sep 17 00:00:00 2001 From: Okke Formsma Date: Tue, 1 Sep 2020 14:37:37 +0200 Subject: [PATCH 18/25] Initial implementation of hold-tap --- app/CMakeLists.txt | 4 +- app/dts/behaviors.dtsi | 2 + app/dts/behaviors/homerow_tap.dtsi | 12 + app/dts/behaviors/layer_tap.dtsi | 12 + app/dts/behaviors/mod_tap.dtsi | 5 +- .../behaviors/zmk,behavior-mod-tap.yaml | 8 - .../behaviors/zmk,behavior-tap-hold.yaml | 23 + app/include/zmk/event-manager.h | 4 + app/run-test-debug.sh | 44 ++ app/src/behaviors/behavior_hold_tap.c | 491 ++++++++++++++++++ app/src/behaviors/behavior_mod_tap.c | 252 --------- app/src/event_manager.c | 6 + app/tests/hold-tap/balanced/1/events.patterns | 4 + .../balanced/1/keycode_events.snapshot | 5 + .../hold-tap/balanced/1/native_posix.keymap | 11 + app/tests/hold-tap/balanced/2/events.patterns | 4 + .../balanced/2/keycode_events.snapshot | 5 + .../hold-tap/balanced/2/native_posix.keymap | 11 + .../hold-tap/balanced/3a/events.patterns | 4 + .../balanced/3a/keycode_events.snapshot | 7 + .../hold-tap/balanced/3a/native_posix.keymap | 13 + .../hold-tap/balanced/3b/events.patterns | 4 + .../balanced/3b/keycode_events.snapshot | 7 + .../hold-tap/balanced/3b/native_posix.keymap | 14 + .../hold-tap/balanced/3c/events.patterns | 4 + .../balanced/3c/keycode_events.snapshot | 7 + .../hold-tap/balanced/3c/native_posix.keymap | 13 + .../hold-tap/balanced/3d/events.patterns | 4 + .../balanced/3d/keycode_events.snapshot | 7 + .../hold-tap/balanced/3d/native_posix.keymap | 13 + .../balanced/4a-nested/events.patterns | 4 + .../4a-nested/keycode_events.snapshot | 10 + .../balanced/4a-nested/native_posix.keymap | 14 + .../hold-tap/balanced/4a/events.patterns | 4 + .../balanced/4a/keycode_events.snapshot | 7 + .../hold-tap/balanced/4a/native_posix.keymap | 14 + .../hold-tap/balanced/4b/events.patterns | 4 + .../balanced/4b/keycode_events.snapshot | 7 + .../hold-tap/balanced/4b/native_posix.keymap | 14 + .../hold-tap/balanced/4c/events.patterns | 4 + .../balanced/4c/keycode_events.snapshot | 7 + .../hold-tap/balanced/4c/native_posix.keymap | 14 + .../hold-tap/balanced/4d/events.patterns | 4 + .../balanced/4d/keycode_events.snapshot | 7 + .../hold-tap/balanced/4d/native_posix.keymap | 14 + .../hold-tap/balanced/behavior_keymap.dtsi | 27 + .../hold-tap/hold-preferred/1/events.patterns | 4 + .../hold-preferred/1/keycode_events.snapshot | 5 + .../hold-preferred/1/native_posix.keymap | 11 + .../hold-tap/hold-preferred/2/events.patterns | 4 + .../hold-preferred/2/keycode_events.snapshot | 5 + .../hold-preferred/2/native_posix.keymap | 11 + .../hold-preferred/3a/events.patterns | 4 + .../hold-preferred/3a/keycode_events.snapshot | 7 + .../hold-preferred/3a/native_posix.keymap | 13 + .../hold-preferred/3b/events.patterns | 4 + .../hold-preferred/3b/keycode_events.snapshot | 7 + .../hold-preferred/3b/native_posix.keymap | 14 + .../hold-preferred/3c/events.patterns | 4 + .../hold-preferred/3c/keycode_events.snapshot | 7 + .../hold-preferred/3c/native_posix.keymap | 13 + .../hold-preferred/3d/events.patterns | 4 + .../hold-preferred/3d/keycode_events.snapshot | 7 + .../hold-preferred/3d/native_posix.keymap | 13 + .../hold-preferred/4a-nested/events.patterns | 4 + .../4a-nested/keycode_events.snapshot | 10 + .../4a-nested/native_posix.keymap | 14 + .../hold-preferred/4a/events.patterns | 4 + .../hold-preferred/4a/keycode_events.snapshot | 7 + .../hold-preferred/4a/native_posix.keymap | 14 + .../hold-preferred/4b/events.patterns | 4 + .../hold-preferred/4b/keycode_events.snapshot | 7 + .../hold-preferred/4b/native_posix.keymap | 14 + .../hold-preferred/4c/events.patterns | 4 + .../hold-preferred/4c/keycode_events.snapshot | 7 + .../hold-preferred/4c/native_posix.keymap | 14 + .../hold-preferred/4d/events.patterns | 4 + .../hold-preferred/4d/keycode_events.snapshot | 7 + .../hold-preferred/4d/native_posix.keymap | 14 + .../hold-preferred/behavior_keymap.dtsi | 29 ++ .../hold-tap/tap-preferred/1/events.patterns | 4 + .../tap-preferred/1/keycode_events.snapshot | 5 + .../tap-preferred/1/native_posix.keymap | 11 + .../hold-tap/tap-preferred/2/events.patterns | 4 + .../tap-preferred/2/keycode_events.snapshot | 5 + .../tap-preferred/2/native_posix.keymap | 11 + .../hold-tap/tap-preferred/3a/events.patterns | 4 + .../tap-preferred/3a/keycode_events.snapshot | 7 + .../tap-preferred/3a/native_posix.keymap | 13 + .../hold-tap/tap-preferred/3b/events.patterns | 4 + .../tap-preferred/3b/keycode_events.snapshot | 7 + .../tap-preferred/3b/native_posix.keymap | 14 + .../hold-tap/tap-preferred/3c/events.patterns | 4 + .../tap-preferred/3c/keycode_events.snapshot | 7 + .../tap-preferred/3c/native_posix.keymap | 13 + .../hold-tap/tap-preferred/3d/events.patterns | 4 + .../tap-preferred/3d/keycode_events.snapshot | 7 + .../tap-preferred/3d/native_posix.keymap | 13 + .../tap-preferred/4a-nested/events.patterns | 4 + .../4a-nested/keycode_events.snapshot | 10 + .../4a-nested/native_posix.keymap | 14 + .../hold-tap/tap-preferred/4a/events.patterns | 4 + .../tap-preferred/4a/keycode_events.snapshot | 7 + .../tap-preferred/4a/native_posix.keymap | 14 + .../hold-tap/tap-preferred/4b/events.patterns | 4 + .../tap-preferred/4b/keycode_events.snapshot | 7 + .../tap-preferred/4b/native_posix.keymap | 14 + .../hold-tap/tap-preferred/4c/events.patterns | 4 + .../tap-preferred/4c/keycode_events.snapshot | 7 + .../tap-preferred/4c/native_posix.keymap | 14 + .../hold-tap/tap-preferred/4d/events.patterns | 4 + .../tap-preferred/4d/keycode_events.snapshot | 7 + .../tap-preferred/4d/native_posix.keymap | 14 + .../tap-preferred/behavior_keymap.dtsi | 27 + app/tests/hold-tap/zmk-modtap-proposal.odg | Bin 0 -> 23148 bytes app/tests/hold-tap/zmk-modtap-proposal.pdf | Bin 0 -> 25493 bytes .../tap-hold/balanced/behavior_keymap.dtsi | 27 + .../hold-preferred/behavior_keymap.dtsi | 29 ++ .../tap-preferred/behavior_keymap.dtsi | 27 + 119 files changed, 1561 insertions(+), 263 deletions(-) create mode 100644 app/dts/behaviors/homerow_tap.dtsi create mode 100644 app/dts/behaviors/layer_tap.dtsi delete mode 100644 app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml create mode 100644 app/dts/bindings/behaviors/zmk,behavior-tap-hold.yaml create mode 100755 app/run-test-debug.sh create mode 100644 app/src/behaviors/behavior_hold_tap.c delete mode 100644 app/src/behaviors/behavior_mod_tap.c create mode 100644 app/tests/hold-tap/balanced/1/events.patterns create mode 100644 app/tests/hold-tap/balanced/1/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/1/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/2/events.patterns create mode 100644 app/tests/hold-tap/balanced/2/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/2/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/3a/events.patterns create mode 100644 app/tests/hold-tap/balanced/3a/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/3a/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/3b/events.patterns create mode 100644 app/tests/hold-tap/balanced/3b/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/3b/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/3c/events.patterns create mode 100644 app/tests/hold-tap/balanced/3c/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/3c/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/3d/events.patterns create mode 100644 app/tests/hold-tap/balanced/3d/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/3d/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/4a-nested/events.patterns create mode 100644 app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/4a-nested/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/4a/events.patterns create mode 100644 app/tests/hold-tap/balanced/4a/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/4a/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/4b/events.patterns create mode 100644 app/tests/hold-tap/balanced/4b/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/4b/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/4c/events.patterns create mode 100644 app/tests/hold-tap/balanced/4c/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/4c/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/4d/events.patterns create mode 100644 app/tests/hold-tap/balanced/4d/keycode_events.snapshot create mode 100644 app/tests/hold-tap/balanced/4d/native_posix.keymap create mode 100644 app/tests/hold-tap/balanced/behavior_keymap.dtsi create mode 100644 app/tests/hold-tap/hold-preferred/1/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/1/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/2/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/2/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/3a/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/3a/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/3b/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/3b/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/3c/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/3c/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/3d/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/3d/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/4a-nested/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/4a/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/4a/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/4b/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/4b/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/4c/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/4c/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/4d/events.patterns create mode 100644 app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot create mode 100644 app/tests/hold-tap/hold-preferred/4d/native_posix.keymap create mode 100644 app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi create mode 100644 app/tests/hold-tap/tap-preferred/1/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/1/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/2/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/2/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/3a/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/3a/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/3b/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/3b/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/3c/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/3c/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/3d/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/3d/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/4a-nested/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/4a/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/4a/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/4b/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/4b/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/4c/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/4c/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/4d/events.patterns create mode 100644 app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot create mode 100644 app/tests/hold-tap/tap-preferred/4d/native_posix.keymap create mode 100644 app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi create mode 100644 app/tests/hold-tap/zmk-modtap-proposal.odg create mode 100644 app/tests/hold-tap/zmk-modtap-proposal.pdf create mode 100644 app/tests/tap-hold/balanced/behavior_keymap.dtsi create mode 100644 app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi create mode 100644 app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index db56c538..2e24fdc2 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -25,7 +25,6 @@ zephyr_linker_sources(RODATA include/linker/zmk-events.ld) target_include_directories(app PRIVATE include) target_sources(app PRIVATE src/kscan.c) target_sources(app PRIVATE src/matrix_transform.c) -target_sources(app PRIVATE src/keymap.c) target_sources(app PRIVATE src/hid.c) target_sources(app PRIVATE src/sensors.c) target_sources_ifdef(CONFIG_ZMK_DISPLAY app PRIVATE src/display.c) @@ -36,12 +35,13 @@ target_sources(app PRIVATE src/events/modifiers_state_changed.c) target_sources(app PRIVATE src/events/sensor_event.c) target_sources(app PRIVATE src/behaviors/behavior_key_press.c) target_sources(app PRIVATE src/behaviors/behavior_reset.c) -target_sources(app PRIVATE src/behaviors/behavior_mod_tap.c) +target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c) target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c) target_sources(app PRIVATE src/behaviors/behavior_toggle_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/keymap.c) target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior_rgb_underglow.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble_unpair_combo.c) diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi index 4cfb7a0f..fdcf426b 100644 --- a/app/dts/behaviors.dtsi +++ b/app/dts/behaviors.dtsi @@ -2,6 +2,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/app/dts/behaviors/homerow_tap.dtsi b/app/dts/behaviors/homerow_tap.dtsi new file mode 100644 index 00000000..21c1531f --- /dev/null +++ b/app/dts/behaviors/homerow_tap.dtsi @@ -0,0 +1,12 @@ +/ { + behaviors { + ht: behavior_homerow_mod { + compatible = "zmk,behavior-hold-tap"; + label = "homerow_mod"; + #binding-cells = <2>; + flavor = "balanced"; + tapping_term_ms = <200>; + bindings = <&kp>, <&kp>; + }; + }; +}; diff --git a/app/dts/behaviors/layer_tap.dtsi b/app/dts/behaviors/layer_tap.dtsi new file mode 100644 index 00000000..af7319b3 --- /dev/null +++ b/app/dts/behaviors/layer_tap.dtsi @@ -0,0 +1,12 @@ +/ { + behaviors { + lt: behavior_layer_tap { + compatible = "zmk,behavior-hold-tap"; + label = "LAYER_TAP"; + #binding-cells = <2>; + flavor = "tap-preferred"; + tapping_term_ms = <200>; + bindings = <&mo>, <&kp>; + }; + }; +}; diff --git a/app/dts/behaviors/mod_tap.dtsi b/app/dts/behaviors/mod_tap.dtsi index 8e3b4e91..4ce732b4 100644 --- a/app/dts/behaviors/mod_tap.dtsi +++ b/app/dts/behaviors/mod_tap.dtsi @@ -1,9 +1,12 @@ / { behaviors { mt: behavior_mod_tap { - compatible = "zmk,behavior-mod-tap"; + compatible = "zmk,behavior-hold-tap"; label = "MOD_TAP"; #binding-cells = <2>; + flavor = "hold-preferred"; + tapping_term_ms = <200>; + bindings = <&kp>, <&kp>; }; }; }; diff --git a/app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml b/app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml deleted file mode 100644 index 7911082f..00000000 --- a/app/dts/bindings/behaviors/zmk,behavior-mod-tap.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2020, Pete Johanson -# SPDX-License-Identifier: MIT - -description: Mod-Tap Beavhior - -compatible: "zmk,behavior-mod-tap" - -include: two_param.yaml diff --git a/app/dts/bindings/behaviors/zmk,behavior-tap-hold.yaml b/app/dts/bindings/behaviors/zmk,behavior-tap-hold.yaml new file mode 100644 index 00000000..a20578fa --- /dev/null +++ b/app/dts/bindings/behaviors/zmk,behavior-tap-hold.yaml @@ -0,0 +1,23 @@ +# Copyright (c) 2020, Cody McGinnis; Okke Formsma +# SPDX-License-Identifier: MIT + +description: Hold or Tap behavior + +compatible: "zmk,behavior-hold-tap" + +include: two_param.yaml + +properties: + bindings: + type: phandles + required: true + tapping_term_ms: + type: int + flavor: + type: string + required: false + default: "hold-preferred" + enum: + - "hold-preferred" + - "balanced" + - "tap-preferred" \ No newline at end of file diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event-manager.h index 43d3f299..07c0aa98 100644 --- a/app/include/zmk/event-manager.h +++ b/app/include/zmk/event-manager.h @@ -78,6 +78,10 @@ struct zmk_event_subscription { #define ZMK_EVENT_RELEASE(ev) \ zmk_event_manager_release((struct zmk_event_header *)ev); +#define ZMK_EVENT_RELEASE_AGAIN(ev) \ + zmk_event_manager_release_again((struct zmk_event_header *)ev); + int zmk_event_manager_raise(struct zmk_event_header *event); int zmk_event_manager_raise_after(struct zmk_event_header *event, const struct zmk_listener *listener); int zmk_event_manager_release(struct zmk_event_header *event); +int zmk_event_manager_release_again(struct zmk_event_header *event); diff --git a/app/run-test-debug.sh b/app/run-test-debug.sh new file mode 100755 index 00000000..f6696a1d --- /dev/null +++ b/app/run-test-debug.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Copyright (c) 2020 Peter Johanson; Cody McGinnis; Okke Formsma +# +# SPDX-License-Identifier: MIT +# +set -e +set -x + +if [ -z "$1" ]; then + echo "Usage: ./run-test.sh " + exit 1 +elif [ "$1" = "all" ]; then + echo "" > ./build/tests/pass-fail.log + find tests -name native_posix.keymap -exec dirname \{\} \; | xargs -l -P 4 ./run-test.sh + err=$? + sort -k2 ./build/tests/pass-fail.log + exit $err +fi + +testcase="$1" +echo "Running $testcase:" + +west build -d build/$testcase -b native_posix --pristine -- -DZMK_CONFIG=$testcase +if [ $? -gt 0 ]; then + echo "FAIL: $testcase did not build" +else + ./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | tee build/$testcase/keycode_events_full.log | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log + cat build/$testcase/keycode_events_full.log + cat build/$testcase/keycode_events.log + diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log + if [ $? -gt 0 ]; then + if [ -f $testcase/pending ]; then + echo "PEND: $testcase" + exit 0 + else + echo "FAIL: $testcase" + exit 1 + fi + else + echo "PASS: $testcase" + exit 0 + fi +fi \ No newline at end of file diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c new file mode 100644 index 00000000..08fa1397 --- /dev/null +++ b/app/src/behaviors/behavior_hold_tap.c @@ -0,0 +1,491 @@ +/* + * Copyright (c) 2020 Cody McGinnis, Okke Formsma + * + * SPDX-License-Identifier: MIT + */ + +#define DT_DRV_COMPAT zmk_behavior_hold_tap + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); + +#if DT_NODE_EXISTS(DT_DRV_INST(0)) + +/************************************************************ DATA SETUP */ +#define ZMK_BHV_HOLD_TAP_MAX_HELD 10 +#define ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS 40 + +// increase if you have keyboard with more keys. +#define ZMK_BHV_HOLD_TAP_POSITION_NOT_USED 9999 + +struct behavior_hold_tap_behaviors { + struct zmk_behavior_binding tap; + struct zmk_behavior_binding hold; +}; + +typedef k_timeout_t (*timer_func)(); + +struct behavior_hold_tap_config { + timer_func tapping_term_ms; + struct behavior_hold_tap_behaviors *behaviors; + char *flavor; +}; + +// this data is specific for each hold-tap +struct active_hold_tap { + s32_t position; + u32_t param_hold; + u32_t param_tap; + bool is_decided; + bool is_hold; + const struct behavior_hold_tap_config *config; + struct k_delayed_work work; + bool work_is_cancelled; +}; + +// The undecided hold tap is the hold tap that needs to be decided before +// other keypress events can be released. While the undecided_hold_tap is +// not NULL, most events are captured in captured_events. +// After the hold_tap is decided, it will stay in the active_hold_taps until +// its key-up has been processed and the delayed work is cleaned up. +struct active_hold_tap *undecided_hold_tap = NULL; +struct active_hold_tap active_hold_taps[ZMK_BHV_HOLD_TAP_MAX_HELD] = {}; +// We capture most position_state_changed events and some modifiers_state_changed events. +const struct zmk_event_header *captured_events[ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS] = {}; + +/************************************************************ CAPTURED POSITION HELPER FUNCTIONS */ +static int capture_event(const struct zmk_event_header *event) +{ + for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) { + if (captured_events[i] == NULL) { + captured_events[i] = event; + return 0; + } + } + return -ENOMEM; +} + +static struct position_state_changed *find_captured_keydown_event(u32_t position) +{ + struct position_state_changed *last_match = NULL; + for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) { + const struct zmk_event_header *eh = captured_events[i]; + if (eh == NULL) { + return last_match; + } + if (!is_position_state_changed(eh)) { + continue; + } + struct position_state_changed *position_event = cast_position_state_changed(eh); + if (position_event->position == position && position_event->state) { + last_match = position_event; + } + } + return last_match; +} + +static void release_captured_events() +{ + if (undecided_hold_tap != NULL) { + return; + } + + // We use a trick to prevent copying the captured_events array. + // + // Events for different mod-tap instances are separated by a NULL pointer. + // + // The first event popped will never be catched by the next active hold-tap + // because to start capturing a mod-tap-key-down event must first completely + // go through the events queue. + // + // Example of this release process; + // [mt2_down, k1_down, k1_up, mt2_up, null, ...] + // ^ + // mt2_down position event isn't captured because no hold-tap is active. + // mt2_down behavior event is handled, now we have an undecided hold-tap + // [null, k1_down, k1_up, mt2_up, null, ...] + // ^ + // k1_down is captured by the mt2 mod-tap + // !note that searches for find_captured_keydown_event by the mt2 behavior will stop at the first null encountered + // [mt1_down, null, k1_up, mt2_up, null, ...] + // ^ + // k1_up event is captured by the new hold-tap: + // [k1_down, k1_up, null, mt2_up, null, ...] + // ^ + // mt2_up event is not captured but causes release of mt2 behavior + // [k1_down, k1_up, null, null, null, ...] + // now mt2 will start releasing it's own captured positions. + for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) { + const struct zmk_event_header *captured_event = captured_events[i]; + if (captured_event == NULL) { + return; + } + captured_events[i] = NULL; + if (undecided_hold_tap != NULL) { + k_msleep(10); + } + if (is_position_state_changed(captured_event)) { + struct position_state_changed *position_event = cast_position_state_changed(captured_event); + LOG_DBG("Releasing key position event for position %d %s", position_event->position, (position_event->state ? "pressed" : "released")); + } else { + struct keycode_state_changed *modifier_event = cast_keycode_state_changed(captured_event); + LOG_DBG("Releasing mods changed event 0x%02X %s", modifier_event->keycode, (modifier_event->state ? "pressed" : "released")); + } + ZMK_EVENT_RELEASE_AGAIN(captured_event); + } +} + + +/************************************************************ ACTIVE TAP HOLD HELPER FUNCTIONS */ + +static struct active_hold_tap *find_hold_tap(u32_t position) +{ + for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) { + if (active_hold_taps[i].position == position) { + return &active_hold_taps[i]; + } + } + return NULL; +} + +static struct active_hold_tap *store_hold_tap(u32_t position, u32_t param_hold, u32_t param_tap, const struct behavior_hold_tap_config *config) +{ + for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) { + if (active_hold_taps[i].position != ZMK_BHV_HOLD_TAP_POSITION_NOT_USED) { + continue; + } + active_hold_taps[i].position = position; + active_hold_taps[i].is_decided = false; + active_hold_taps[i].is_hold = false; + active_hold_taps[i].config = config; + active_hold_taps[i].param_hold = param_hold; + active_hold_taps[i].param_tap = param_tap; + return &active_hold_taps[i]; + } + return NULL; +} + +static void clear_hold_tap(struct active_hold_tap *hold_tap) +{ + hold_tap->position = ZMK_BHV_HOLD_TAP_POSITION_NOT_USED; + hold_tap->is_decided = false; + hold_tap->is_hold = false; + hold_tap->work_is_cancelled = false; +} + +enum decision_moment { + HT_KEY_UP = 0, + HT_OTHER_KEY_DOWN = 1, + HT_OTHER_KEY_UP = 2, + HT_TIMER_EVENT = 3, +}; + +static void decide_balanced(struct active_hold_tap *hold_tap, enum decision_moment event) +{ + switch (event) { + case HT_KEY_UP: + hold_tap->is_hold = 0; + hold_tap->is_decided = true; + break; + case HT_OTHER_KEY_UP: + hold_tap->is_hold = 1; + hold_tap->is_decided = true; + break; + case HT_TIMER_EVENT: + hold_tap->is_hold = 1; + hold_tap->is_decided = true; + break; + default: return; + } +} + +static void decide_tap_preferred(struct active_hold_tap *hold_tap, enum decision_moment event) +{ + switch (event) { + case HT_KEY_UP: + hold_tap->is_hold = 0; + hold_tap->is_decided = true; + break; + case HT_TIMER_EVENT: + hold_tap->is_hold = 1; + hold_tap->is_decided = true; + break; + default: return; + } +} + +static void decide_hold_preferred(struct active_hold_tap *hold_tap, enum decision_moment event) +{ + switch (event) { + case HT_KEY_UP: + hold_tap->is_hold = 0; + hold_tap->is_decided = true; + break; + case HT_OTHER_KEY_DOWN: + hold_tap->is_hold = 1; + hold_tap->is_decided = true; + break; + case HT_TIMER_EVENT: + hold_tap->is_hold = 1; + hold_tap->is_decided = true; + break; + default: return; + } +} + +static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_moment event) +{ + if (hold_tap->is_decided) { + return; + } + + if (hold_tap != undecided_hold_tap) { + LOG_DBG("ERROR found undecided tap hold that is not the active tap hold"); + return; + } + + char *flavor = hold_tap->config->flavor; + if (strcmp(flavor, "balanced") == 0) { + decide_balanced(hold_tap, event); + } else if (strcmp(flavor, "tap-preferred") == 0) { + decide_tap_preferred(hold_tap, event); + } else if (strcmp(flavor, "hold-preferred") == 0) { + decide_hold_preferred(hold_tap, event); + } + + if (!hold_tap->is_decided) { + return; + } + + LOG_DBG("%d decided %s (%s event %d)", hold_tap->position, hold_tap->is_hold ? "hold" : "tap", flavor, event); + undecided_hold_tap = NULL; + + struct zmk_behavior_binding *behavior; + if (hold_tap->is_hold) { + behavior = &hold_tap->config->behaviors->hold; + struct device *behavior_device = device_get_binding(behavior->behavior_dev); + behavior_keymap_binding_pressed(behavior_device, hold_tap->position, hold_tap->param_hold, 0); + } else { + behavior = &hold_tap->config->behaviors->tap; + struct device *behavior_device = device_get_binding(behavior->behavior_dev); + behavior_keymap_binding_pressed(behavior_device, hold_tap->position, hold_tap->param_tap, 0); + } + release_captured_events(); +} + +/************************************************************ hold_tap_binding and key handlers */ +static int on_hold_tap_binding_pressed(struct device *dev, u32_t position, u32_t param_hold, u32_t param_tap) +{ + const struct behavior_hold_tap_config *cfg = dev->config_info; + + if (undecided_hold_tap != NULL) { + LOG_DBG("ERROR another hold-tap behavior is undecided."); + // if this happens, make sure the behavior events occur AFTER other position events. + return 0; + } + + struct active_hold_tap *hold_tap = store_hold_tap(position, param_hold, param_tap, cfg); + if (hold_tap == NULL) { + LOG_ERR("unable to store hold-tap info, did you press more than %d hold-taps?", ZMK_BHV_HOLD_TAP_MAX_HELD); + return 0; + } + + LOG_DBG("%d new undecided hold_tap", position); + undecided_hold_tap = hold_tap; + k_delayed_work_submit(&hold_tap->work, cfg->tapping_term_ms()); + + // todo: once we get timing info for keypresses, start the timer relative to the original keypress + // don't forget to simulate a timer-event before the event after that time was handled. + + return 0; +} + +static int on_hold_tap_binding_released(struct device *dev, u32_t position, u32_t _, u32_t __) +{ + struct active_hold_tap *hold_tap = find_hold_tap(position); + + if (hold_tap == NULL) { + LOG_ERR("ACTIVE_HOLD_TAP_CLEANED_UP_TOO_EARLY"); + return 0; + } + + int work_cancel_result = k_delayed_work_cancel(&hold_tap->work); + decide_hold_tap(hold_tap, HT_KEY_UP); + + struct zmk_behavior_binding *behavior; + if (hold_tap->is_hold) { + behavior = &hold_tap->config->behaviors->hold; + struct device *behavior_device = device_get_binding(behavior->behavior_dev); + behavior_keymap_binding_released(behavior_device, hold_tap->position, hold_tap->param_hold, 0); + } else { + behavior = &hold_tap->config->behaviors->tap; + struct device *behavior_device = device_get_binding(behavior->behavior_dev); + behavior_keymap_binding_released(behavior_device, hold_tap->position, hold_tap->param_tap, 0); + } + + + if (work_cancel_result == -EINPROGRESS) { + // let the timer handler clean up + // if we'd clear now, the timer may call back for an uninitialized active_hold_tap. + LOG_DBG("%d hold-tap timer work in event queue", position); + hold_tap->work_is_cancelled = true; + } else { + LOG_DBG("%d cleaning up hold-tap", position); + clear_hold_tap(hold_tap); + } + + return 0; +} + +static const struct behavior_driver_api behavior_hold_tap_driver_api = { + .binding_pressed = on_hold_tap_binding_pressed, + .binding_released = on_hold_tap_binding_released, +}; + + +static int position_state_changed_listener(const struct zmk_event_header *eh) +{ + struct position_state_changed *ev = cast_position_state_changed(eh); + + if (undecided_hold_tap == NULL) { + LOG_DBG("%d bubble (no undecided hold_tap active)", ev->position); + return 0; + } + + if (undecided_hold_tap->position == ev->position) { + if (ev->state) { // keydown + LOG_ERR("hold-tap listener should be called before before most other listeners!"); + return 0; + } else { // keyup + LOG_DBG("%d bubble undecided hold-tap keyrelease event", undecided_hold_tap->position); + return 0; + } + } + + if (!ev->state && find_captured_keydown_event(ev->position) == NULL) { + // no keydown event has been captured, let it bubble. + // we'll catch modifiers later in modifier_state_changed_listener + LOG_DBG("%d bubbling %d %s event", undecided_hold_tap->position, ev->position, ev->state ? "down" : "up"); + return 0; + } + + LOG_DBG("%d capturing %d %s event", undecided_hold_tap->position, ev->position, ev->state ? "down" : "up"); + capture_event(eh); + decide_hold_tap(undecided_hold_tap, ev->state ? HT_OTHER_KEY_DOWN : HT_OTHER_KEY_UP); + return ZMK_EV_EVENT_CAPTURED; +} + +static bool is_mod(struct keycode_state_changed *ev) +{ + return ev->usage_page == USAGE_KEYPAD && ev->keycode >= LCTL && ev->keycode <= RGUI; +} + +static int keycode_state_changed_listener(const struct zmk_event_header *eh) +{ + // we want to catch layer-up events too... how? + struct keycode_state_changed *ev = cast_keycode_state_changed(eh); + + if (undecided_hold_tap == NULL) { + // LOG_DBG("0x%02X bubble (no undecided hold_tap active)", ev->keycode); + return 0; + } + + if (!is_mod(ev)) { + // LOG_DBG("0x%02X bubble (not a mod)", ev->keycode); + return 0; + } + + // only key-up events will bubble through position_state_changed_listener + // if a undecided_hold_tap is active. + LOG_DBG("%d capturing 0x%02X %s event", undecided_hold_tap->position, ev->keycode, ev->state ? "down" : "up"); + capture_event(eh); + return ZMK_EV_EVENT_CAPTURED; +} + + +int behavior_hold_tap_listener(const struct zmk_event_header *eh) +{ + if (is_position_state_changed(eh)) { + return position_state_changed_listener(eh); + } else if (is_keycode_state_changed(eh)) { + return keycode_state_changed_listener(eh); + } + return 0; +} + +ZMK_LISTENER(behavior_hold_tap, behavior_hold_tap_listener); +ZMK_SUBSCRIPTION(behavior_hold_tap, position_state_changed); +// this should be modifiers_state_changed, but unfrotunately that's not implemented yet. +ZMK_SUBSCRIPTION(behavior_hold_tap, keycode_state_changed); + +/************************************************************ TIMER FUNCTIONS */ +void behavior_hold_tap_timer_work_handler(struct k_work *item) +{ + struct active_hold_tap *hold_tap = CONTAINER_OF(item, struct active_hold_tap, work); + + if (hold_tap->work_is_cancelled) { + clear_hold_tap(hold_tap); + } else { + decide_hold_tap(hold_tap, HT_TIMER_EVENT); + } +} + +static int behavior_hold_tap_init(struct device *dev) +{ + static bool init_first_run = true; + + if (init_first_run) { + for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) { + k_delayed_work_init(&active_hold_taps[i].work, behavior_hold_tap_timer_work_handler); + active_hold_taps[i].position = ZMK_BHV_HOLD_TAP_POSITION_NOT_USED; + } + } + init_first_run = false; + return 0; +} + +struct behavior_hold_tap_data {}; +static struct behavior_hold_tap_data behavior_hold_tap_data; + +/************************************************************ NODE CONFIG */ +#define _TRANSFORM_ENTRY(idx, node) \ + { \ + .behavior_dev = DT_LABEL(DT_INST_PHANDLE_BY_IDX(node, bindings, idx)), \ + .param1 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param1), (0), (DT_INST_PHA_BY_IDX(node, bindings, idx, param1))), \ + .param2 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param2), (0), (DT_INST_PHA_BY_IDX(node, bindings, idx, param2))), \ + }, + +#define KP_INST(n) \ + static k_timeout_t behavior_hold_tap_config_##n##_gettime() { return K_MSEC(DT_INST_PROP(n, tapping_term_ms)); } \ + static struct behavior_hold_tap_behaviors behavior_hold_tap_behaviors_##n = { \ + .hold = _TRANSFORM_ENTRY(0, n) \ + .tap = _TRANSFORM_ENTRY(1, n) \ + }; \ + static struct behavior_hold_tap_config behavior_hold_tap_config_##n = { \ + .behaviors = &behavior_hold_tap_behaviors_##n, \ + .tapping_term_ms = &behavior_hold_tap_config_##n##_gettime, \ + .flavor = DT_INST_PROP(n, flavor), \ + }; \ + DEVICE_AND_API_INIT( \ + behavior_hold_tap_##n, DT_INST_LABEL(n), behavior_hold_tap_init, \ + &behavior_hold_tap_data, \ + &behavior_hold_tap_config_##n, \ + APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ + &behavior_hold_tap_driver_api); + +DT_INST_FOREACH_STATUS_OKAY(KP_INST) + + +#endif \ No newline at end of file diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c deleted file mode 100644 index 5a2f60e2..00000000 --- a/app/src/behaviors/behavior_mod_tap.c +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright (c) 2020 Peter Johanson - * - * SPDX-License-Identifier: MIT - */ - -#define DT_DRV_COMPAT zmk_behavior_mod_tap - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); - -#define ZMK_BHV_MOD_TAP_MAX_HELD 4 -#define ZMK_BHV_MOD_TAP_MAX_PENDING_KC 4 - -struct active_mod_tap_item { - u32_t keycode; - u8_t mods; - bool pending; - zmk_mod_flags active_mods; -}; - -struct captured_keycode_state_change_item { - struct keycode_state_changed* event; - zmk_mod_flags active_mods; -}; - -struct behavior_mod_tap_config { }; -struct behavior_mod_tap_data { - struct active_mod_tap_item active_mod_taps[ZMK_BHV_MOD_TAP_MAX_HELD]; - struct captured_keycode_state_change_item captured_keycode_events[ZMK_BHV_MOD_TAP_MAX_PENDING_KC]; -}; - -bool have_pending_mods(char *label) { - struct device *dev = device_get_binding(label); - struct behavior_mod_tap_data *data = dev->driver_data; - - for (int i = 0; i < ZMK_BHV_MOD_TAP_MAX_HELD; i++) { - if (data->active_mod_taps[i].mods) { - LOG_DBG("Found pending mods for %d and keycode 0x%02X", data->active_mod_taps[i].mods, data->active_mod_taps[i].keycode); - return true; - } - } - - return false; -} - -struct captured_keycode_state_change_item* find_pending_keycode(struct behavior_mod_tap_data *data, u32_t keycode) -{ - for (int i = 0; i < ZMK_BHV_MOD_TAP_MAX_PENDING_KC; i++) { - if (data->captured_keycode_events[i].event == NULL) { - continue; - } - - if (data->captured_keycode_events[i].event->keycode == keycode) { - return &data->captured_keycode_events[i]; - } - } - - return NULL; -} - -zmk_mod_flags behavior_mod_tap_active_mods(struct behavior_mod_tap_data *data) -{ - zmk_mod_flags mods = 0; - - for (int i = 0; i < ZMK_BHV_MOD_TAP_MAX_HELD; i++) { - mods |= data->active_mod_taps[i].mods; - } - - return mods; -} - -int behavior_mod_tap_capture_keycode_event(struct behavior_mod_tap_data *data, struct keycode_state_changed *ev) -{ - for (int i = 0; i < ZMK_BHV_MOD_TAP_MAX_PENDING_KC; i++) { - if (data->captured_keycode_events[i].event != NULL) { - continue; - } - - data->captured_keycode_events[i].event = ev; - data->captured_keycode_events[i].active_mods = behavior_mod_tap_active_mods(data); - return 0; - } - - return -ENOMEM; -} - -void behavior_mod_tap_update_active_mods_state(struct behavior_mod_tap_data *data, zmk_mod_flags used_flags) -{ - for (int i = 0; i < ZMK_BHV_MOD_TAP_MAX_HELD; i++) { - if ((data->active_mod_taps[i].mods & used_flags) == data->active_mod_taps[i].mods) { - data->active_mod_taps[i].pending = false; - } - } -} - -// How to pass context to subscription?! -int behavior_mod_tap_listener(const struct zmk_event_header *eh) -{ - if (is_keycode_state_changed(eh) && have_pending_mods(DT_INST_LABEL(0))) { - struct device *dev = device_get_binding(DT_INST_LABEL(0)); - struct keycode_state_changed *ev = cast_keycode_state_changed(eh); - struct behavior_mod_tap_data *data = dev->driver_data; - struct captured_keycode_state_change_item* pending_keycode; - if (ev->state) { - LOG_DBG("Have pending mods, capturing keycode 0x%02X event to ressend later", ev->keycode); - behavior_mod_tap_capture_keycode_event(data, ev); - return ZMK_EV_EVENT_CAPTURED; - } else if ((pending_keycode = find_pending_keycode(data, ev->keycode)) != NULL) { - LOG_DBG("Key released, going to activate mods 0x%02X then send pending key press for keycode 0x%02X", - pending_keycode->active_mods, pending_keycode->event->keycode); - - zmk_hid_register_mods(pending_keycode->active_mods); - behavior_mod_tap_update_active_mods_state(data, pending_keycode->active_mods); - - ZMK_EVENT_RELEASE(pending_keycode->event); - k_msleep(10); - - pending_keycode->event = NULL; - pending_keycode->active_mods = 0; - } - } - return 0; -} - -ZMK_LISTENER(behavior_mod_tap, behavior_mod_tap_listener); -ZMK_SUBSCRIPTION(behavior_mod_tap, keycode_state_changed); - -static int behavior_mod_tap_init(struct device *dev) -{ - return 0; -}; - - -static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t mods, u32_t keycode) -{ - struct behavior_mod_tap_data *data = dev->driver_data; - LOG_DBG("mods: %d, keycode: 0x%02X", mods, keycode); - for (int i = 0; i < ZMK_BHV_MOD_TAP_MAX_HELD; i++) { - if (data->active_mod_taps[i].mods != 0) { - continue; - } - - zmk_mod_flags active_mods = behavior_mod_tap_active_mods(data); - - data->active_mod_taps[i].active_mods = active_mods; - data->active_mod_taps[i].mods = mods; - data->active_mod_taps[i].keycode = keycode; - data->active_mod_taps[i].pending = true; - - return 0; - } - - LOG_WRN("Failed to record mod-tap activation, at maximum concurrent mod-tap activations"); - - return -ENOMEM; -} - -static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t mods, u32_t keycode) -{ - struct behavior_mod_tap_data *data = dev->driver_data; - LOG_DBG("mods: %d, keycode: %d", mods, keycode); - - for (int i = 0; i < ZMK_BHV_MOD_TAP_MAX_HELD; i++) { - struct active_mod_tap_item *item = &data->active_mod_taps[i]; - if (item->mods == mods && item->keycode == keycode) { - if (item->pending) { - LOG_DBG("Sending un-triggered mod-tap for keycode: 0x%02X", keycode); - - if (item->active_mods) { - LOG_DBG("Registering recorded active mods captured when mod-tap initially activated: 0x%02X", item->active_mods); - behavior_mod_tap_update_active_mods_state(data, item->active_mods); - zmk_hid_register_mods(item->active_mods); - } - - struct keycode_state_changed *key_press = create_keycode_state_changed(USAGE_KEYPAD, item->keycode, true); - ZMK_EVENT_RAISE_AFTER(key_press, behavior_mod_tap); - k_msleep(10); - - for (int j = 0; j < ZMK_BHV_MOD_TAP_MAX_PENDING_KC; j++) { - if (data->captured_keycode_events[j].event == NULL) { - continue; - } - - struct keycode_state_changed *ev = data->captured_keycode_events[j].event; - data->captured_keycode_events[j].event = NULL; - data->captured_keycode_events[j].active_mods = 0; - LOG_DBG("Re-sending latched key press for usage page 0x%02X keycode 0x%02X state %s", ev->usage_page, ev->keycode, (ev->state ? "pressed" : "released")); - ZMK_EVENT_RELEASE(ev); - k_msleep(10); - } - - struct keycode_state_changed *key_release = create_keycode_state_changed(USAGE_KEYPAD, keycode, false); - LOG_DBG("Sending un-triggered mod-tap release for keycode: 0x%02X", keycode); - ZMK_EVENT_RAISE_AFTER(key_release, behavior_mod_tap); - k_msleep(10); - - if (item->active_mods) { - LOG_DBG("Unregistering recorded active mods captured when mod-tap initially activated: 0x%02X", item->active_mods); - zmk_hid_unregister_mods(item->active_mods); - zmk_endpoints_send_report(USAGE_KEYPAD); - } - - - } else { - LOG_DBG("Releasing triggered mods: %d", mods); - zmk_hid_unregister_mods(mods); - zmk_endpoints_send_report(USAGE_KEYPAD); - } - - item->mods = 0; - item->keycode = 0; - item->active_mods = 0; - - LOG_DBG("Removing mods %d from active_mods for other held mod-taps", mods); - for (int j = 0; j < ZMK_BHV_MOD_TAP_MAX_HELD; j++) { - if (data->active_mod_taps[j].active_mods & mods) { - LOG_DBG("Removing 0x%02X from active mod tap mods 0x%02X keycode 0x%02X", mods, data->active_mod_taps[j].mods, data->active_mod_taps[j].keycode); - data->active_mod_taps[j].active_mods &= ~mods; - } - } - break; - } - } - - return 0; -} - -static const struct behavior_driver_api behavior_mod_tap_driver_api = { - .binding_pressed = on_keymap_binding_pressed, - .binding_released = on_keymap_binding_released, -}; - -static const struct behavior_mod_tap_config behavior_mod_tap_config = {}; - -static struct behavior_mod_tap_data behavior_mod_tap_data; - -DEVICE_AND_API_INIT(behavior_mod_tap, DT_INST_LABEL(0), behavior_mod_tap_init, - &behavior_mod_tap_data, - &behavior_mod_tap_config, - APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, - &behavior_mod_tap_driver_api); diff --git a/app/src/event_manager.c b/app/src/event_manager.c index c405176f..2f423fc5 100644 --- a/app/src/event_manager.c +++ b/app/src/event_manager.c @@ -74,4 +74,10 @@ int zmk_event_manager_raise_after(struct zmk_event_header *event, const struct z int zmk_event_manager_release(struct zmk_event_header *event) { return zmk_event_manager_handle_from(event, event->last_listener_index + 1); +} + + +int zmk_event_manager_release_again(struct zmk_event_header *event) +{ + return zmk_event_manager_handle_from(event, event->last_listener_index); } \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/1/events.patterns b/app/tests/hold-tap/balanced/1/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/1/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/1/keycode_events.snapshot b/app/tests/hold-tap/balanced/1/keycode_events.snapshot new file mode 100644 index 00000000..5f6a2668 --- /dev/null +++ b/app/tests/hold-tap/balanced/1/keycode_events.snapshot @@ -0,0 +1,5 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (balanced event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/1/native_posix.keymap b/app/tests/hold-tap/balanced/1/native_posix.keymap new file mode 100644 index 00000000..10336ef3 --- /dev/null +++ b/app/tests/hold-tap/balanced/1/native_posix.keymap @@ -0,0 +1,11 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/2/events.patterns b/app/tests/hold-tap/balanced/2/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/2/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/2/keycode_events.snapshot b/app/tests/hold-tap/balanced/2/keycode_events.snapshot new file mode 100644 index 00000000..ddda1ae4 --- /dev/null +++ b/app/tests/hold-tap/balanced/2/keycode_events.snapshot @@ -0,0 +1,5 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (balanced event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/2/native_posix.keymap b/app/tests/hold-tap/balanced/2/native_posix.keymap new file mode 100644 index 00000000..aa93b862 --- /dev/null +++ b/app/tests/hold-tap/balanced/2/native_posix.keymap @@ -0,0 +1,11 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,500) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3a/events.patterns b/app/tests/hold-tap/balanced/3a/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/3a/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3a/keycode_events.snapshot b/app/tests/hold-tap/balanced/3a/keycode_events.snapshot new file mode 100644 index 00000000..a4351030 --- /dev/null +++ b/app/tests/hold-tap/balanced/3a/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0xe4 +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (balanced event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0xe4 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/3a/native_posix.keymap b/app/tests/hold-tap/balanced/3a/native_posix.keymap new file mode 100644 index 00000000..6f08689b --- /dev/null +++ b/app/tests/hold-tap/balanced/3a/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,1,10) /*ctrl*/ + ZMK_MOCK_PRESS(0,0,100) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,1,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3b/events.patterns b/app/tests/hold-tap/balanced/3b/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/3b/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3b/keycode_events.snapshot b/app/tests/hold-tap/balanced/3b/keycode_events.snapshot new file mode 100644 index 00000000..c0da94fd --- /dev/null +++ b/app/tests/hold-tap/balanced/3b/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0xe4 +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (balanced event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe4 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/3b/native_posix.keymap b/app/tests/hold-tap/balanced/3b/native_posix.keymap new file mode 100644 index 00000000..392d328b --- /dev/null +++ b/app/tests/hold-tap/balanced/3b/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,1,10) /*ctrl*/ + ZMK_MOCK_PRESS(0,0,50) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,1,300) + /*timer*/ + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3c/events.patterns b/app/tests/hold-tap/balanced/3c/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/3c/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3c/keycode_events.snapshot b/app/tests/hold-tap/balanced/3c/keycode_events.snapshot new file mode 100644 index 00000000..ce6e7b7c --- /dev/null +++ b/app/tests/hold-tap/balanced/3c/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0x07 +ht_binding_pressed: 0 new undecided hold_tap +kp_released: usage_page 0x07 keycode 0x07 +ht_decide: 0 decided tap (balanced event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/3c/native_posix.keymap b/app/tests/hold-tap/balanced/3c/native_posix.keymap new file mode 100644 index 00000000..77306cd0 --- /dev/null +++ b/app/tests/hold-tap/balanced/3c/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,0,10) /*d*/ + ZMK_MOCK_PRESS(0,0,100) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3d/events.patterns b/app/tests/hold-tap/balanced/3d/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/3d/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/3d/keycode_events.snapshot b/app/tests/hold-tap/balanced/3d/keycode_events.snapshot new file mode 100644 index 00000000..1ec384a6 --- /dev/null +++ b/app/tests/hold-tap/balanced/3d/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0x07 +ht_binding_pressed: 0 new undecided hold_tap +kp_released: usage_page 0x07 keycode 0x07 +ht_decide: 0 decided hold (balanced event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/3d/native_posix.keymap b/app/tests/hold-tap/balanced/3d/native_posix.keymap new file mode 100644 index 00000000..14413311 --- /dev/null +++ b/app/tests/hold-tap/balanced/3d/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,0,10) /* d */ + ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */ + ZMK_MOCK_RELEASE(1,0,400) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4a-nested/events.patterns b/app/tests/hold-tap/balanced/4a-nested/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/4a-nested/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot new file mode 100644 index 00000000..8a1980b8 --- /dev/null +++ b/app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot @@ -0,0 +1,10 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (balanced event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +ht_binding_pressed: 1 new undecided hold_tap +ht_decide: 1 decided tap (balanced event 0) +kp_pressed: usage_page 0x07 keycode 0x0d +kp_released: usage_page 0x07 keycode 0x0d +ht_binding_released: 1 cleaning up hold-tap +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/4a-nested/native_posix.keymap b/app/tests/hold-tap/balanced/4a-nested/native_posix.keymap new file mode 100644 index 00000000..c10c6d64 --- /dev/null +++ b/app/tests/hold-tap/balanced/4a-nested/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,200) + ZMK_MOCK_PRESS(0,1,200) + /* timer fires */ + ZMK_MOCK_RELEASE(0,1,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4a/events.patterns b/app/tests/hold-tap/balanced/4a/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/4a/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4a/keycode_events.snapshot b/app/tests/hold-tap/balanced/4a/keycode_events.snapshot new file mode 100644 index 00000000..b89b21dc --- /dev/null +++ b/app/tests/hold-tap/balanced/4a/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (balanced event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/4a/native_posix.keymap b/app/tests/hold-tap/balanced/4a/native_posix.keymap new file mode 100644 index 00000000..ce163f53 --- /dev/null +++ b/app/tests/hold-tap/balanced/4a/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,200) + ZMK_MOCK_PRESS(1,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4b/events.patterns b/app/tests/hold-tap/balanced/4b/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/4b/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4b/keycode_events.snapshot b/app/tests/hold-tap/balanced/4b/keycode_events.snapshot new file mode 100644 index 00000000..798e2eed --- /dev/null +++ b/app/tests/hold-tap/balanced/4b/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (balanced event 2) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/4b/native_posix.keymap b/app/tests/hold-tap/balanced/4b/native_posix.keymap new file mode 100644 index 00000000..7abda41a --- /dev/null +++ b/app/tests/hold-tap/balanced/4b/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,100) + ZMK_MOCK_PRESS(1,0,100) + ZMK_MOCK_RELEASE(1,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4c/events.patterns b/app/tests/hold-tap/balanced/4c/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/4c/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4c/keycode_events.snapshot b/app/tests/hold-tap/balanced/4c/keycode_events.snapshot new file mode 100644 index 00000000..798e2eed --- /dev/null +++ b/app/tests/hold-tap/balanced/4c/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (balanced event 2) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/balanced/4c/native_posix.keymap b/app/tests/hold-tap/balanced/4c/native_posix.keymap new file mode 100644 index 00000000..ce030af3 --- /dev/null +++ b/app/tests/hold-tap/balanced/4c/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,10) + ZMK_MOCK_PRESS(1,0,10) + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + /* timer */ + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4d/events.patterns b/app/tests/hold-tap/balanced/4d/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/balanced/4d/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/4d/keycode_events.snapshot b/app/tests/hold-tap/balanced/4d/keycode_events.snapshot new file mode 100644 index 00000000..5c9f4e33 --- /dev/null +++ b/app/tests/hold-tap/balanced/4d/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (balanced event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap +kp_released: usage_page 0x07 keycode 0x07 diff --git a/app/tests/hold-tap/balanced/4d/native_posix.keymap b/app/tests/hold-tap/balanced/4d/native_posix.keymap new file mode 100644 index 00000000..54676600 --- /dev/null +++ b/app/tests/hold-tap/balanced/4d/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,100) + ZMK_MOCK_PRESS(1,0,100) + ZMK_MOCK_RELEASE(0,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(1,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/balanced/behavior_keymap.dtsi b/app/tests/hold-tap/balanced/behavior_keymap.dtsi new file mode 100644 index 00000000..df56fb5b --- /dev/null +++ b/app/tests/hold-tap/balanced/behavior_keymap.dtsi @@ -0,0 +1,27 @@ +#include +#include +#include + +/ { + behaviors { + ht_bal: behavior_hold_tap_balanced { + compatible = "zmk,behavior-hold-tap"; + label = "HOLD_TAP_BALANCED"; + #binding-cells = <2>; + flavor = "balanced"; + tapping_term_ms = <300>; + bindings = <&kp>, <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + + default_layer { + bindings = < + &ht_bal LSFT F &ht_bal LCTL J + &kp D &kp RCTL>; + }; + }; +}; diff --git a/app/tests/hold-tap/hold-preferred/1/events.patterns b/app/tests/hold-tap/hold-preferred/1/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/1/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot new file mode 100644 index 00000000..cf787d8d --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot @@ -0,0 +1,5 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (hold-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/1/native_posix.keymap b/app/tests/hold-tap/hold-preferred/1/native_posix.keymap new file mode 100644 index 00000000..10336ef3 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/1/native_posix.keymap @@ -0,0 +1,11 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/2/events.patterns b/app/tests/hold-tap/hold-preferred/2/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/2/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot new file mode 100644 index 00000000..03329d53 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot @@ -0,0 +1,5 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (hold-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/2/native_posix.keymap b/app/tests/hold-tap/hold-preferred/2/native_posix.keymap new file mode 100644 index 00000000..aa93b862 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/2/native_posix.keymap @@ -0,0 +1,11 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,500) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3a/events.patterns b/app/tests/hold-tap/hold-preferred/3a/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3a/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot new file mode 100644 index 00000000..adf4fe23 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0xe4 +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (hold-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0xe4 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/3a/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3a/native_posix.keymap new file mode 100644 index 00000000..6f08689b --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3a/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,1,10) /*ctrl*/ + ZMK_MOCK_PRESS(0,0,100) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,1,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3b/events.patterns b/app/tests/hold-tap/hold-preferred/3b/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3b/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot new file mode 100644 index 00000000..69b64a96 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0xe4 +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (hold-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe4 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/3b/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3b/native_posix.keymap new file mode 100644 index 00000000..392d328b --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3b/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,1,10) /*ctrl*/ + ZMK_MOCK_PRESS(0,0,50) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,1,300) + /*timer*/ + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3c/events.patterns b/app/tests/hold-tap/hold-preferred/3c/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3c/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot new file mode 100644 index 00000000..b06a1d76 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0x07 +ht_binding_pressed: 0 new undecided hold_tap +kp_released: usage_page 0x07 keycode 0x07 +ht_decide: 0 decided tap (hold-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/3c/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3c/native_posix.keymap new file mode 100644 index 00000000..77306cd0 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3c/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,0,10) /*d*/ + ZMK_MOCK_PRESS(0,0,100) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3d/events.patterns b/app/tests/hold-tap/hold-preferred/3d/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3d/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot new file mode 100644 index 00000000..bf31955b --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0x07 +ht_binding_pressed: 0 new undecided hold_tap +kp_released: usage_page 0x07 keycode 0x07 +ht_decide: 0 decided hold (hold-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/3d/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3d/native_posix.keymap new file mode 100644 index 00000000..14413311 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/3d/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,0,10) /* d */ + ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */ + ZMK_MOCK_RELEASE(1,0,400) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/events.patterns b/app/tests/hold-tap/hold-preferred/4a-nested/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4a-nested/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot new file mode 100644 index 00000000..3ed7de0d --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot @@ -0,0 +1,10 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (hold-preferred event 1) +kp_pressed: usage_page 0x07 keycode 0xe1 +ht_binding_pressed: 1 new undecided hold_tap +ht_decide: 1 decided tap (hold-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x0d +kp_released: usage_page 0x07 keycode 0x0d +ht_binding_released: 1 cleaning up hold-tap +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap new file mode 100644 index 00000000..c10c6d64 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,200) + ZMK_MOCK_PRESS(0,1,200) + /* timer fires */ + ZMK_MOCK_RELEASE(0,1,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4a/events.patterns b/app/tests/hold-tap/hold-preferred/4a/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4a/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot new file mode 100644 index 00000000..e0b57fd4 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (hold-preferred event 1) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/4a/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a/native_posix.keymap new file mode 100644 index 00000000..ce163f53 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4a/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,200) + ZMK_MOCK_PRESS(1,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4b/events.patterns b/app/tests/hold-tap/hold-preferred/4b/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4b/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot new file mode 100644 index 00000000..e0b57fd4 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (hold-preferred event 1) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/4b/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4b/native_posix.keymap new file mode 100644 index 00000000..7abda41a --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4b/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,100) + ZMK_MOCK_PRESS(1,0,100) + ZMK_MOCK_RELEASE(1,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4c/events.patterns b/app/tests/hold-tap/hold-preferred/4c/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4c/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot new file mode 100644 index 00000000..e0b57fd4 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (hold-preferred event 1) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/hold-preferred/4c/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4c/native_posix.keymap new file mode 100644 index 00000000..ce030af3 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4c/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,10) + ZMK_MOCK_PRESS(1,0,10) + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + /* timer */ + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4d/events.patterns b/app/tests/hold-tap/hold-preferred/4d/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4d/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot new file mode 100644 index 00000000..cac579d2 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (hold-preferred event 1) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap +kp_released: usage_page 0x07 keycode 0x07 diff --git a/app/tests/hold-tap/hold-preferred/4d/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4d/native_posix.keymap new file mode 100644 index 00000000..54676600 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/4d/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,100) + ZMK_MOCK_PRESS(1,0,100) + ZMK_MOCK_RELEASE(0,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(1,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi new file mode 100644 index 00000000..375ffd93 --- /dev/null +++ b/app/tests/hold-tap/hold-preferred/behavior_keymap.dtsi @@ -0,0 +1,29 @@ +#include +#include +#include + + + +/ { + behaviors { + ht_hold: behavior_hold_hold_tap { + compatible = "zmk,behavior-hold-tap"; + label = "hold_hold_tap"; + #binding-cells = <2>; + flavor = "hold-preferred"; + tapping_term_ms = <300>; + bindings = <&kp>, <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + + default_layer { + bindings = < + &ht_hold LSFT F &ht_hold LCTL J + &kp D &kp RCTL>; + }; + }; +}; diff --git a/app/tests/hold-tap/tap-preferred/1/events.patterns b/app/tests/hold-tap/tap-preferred/1/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/1/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot new file mode 100644 index 00000000..2a250fb8 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot @@ -0,0 +1,5 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (tap-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/1/native_posix.keymap b/app/tests/hold-tap/tap-preferred/1/native_posix.keymap new file mode 100644 index 00000000..10336ef3 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/1/native_posix.keymap @@ -0,0 +1,11 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/2/events.patterns b/app/tests/hold-tap/tap-preferred/2/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/2/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot new file mode 100644 index 00000000..4f1ee635 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot @@ -0,0 +1,5 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (tap-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/2/native_posix.keymap b/app/tests/hold-tap/tap-preferred/2/native_posix.keymap new file mode 100644 index 00000000..aa93b862 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/2/native_posix.keymap @@ -0,0 +1,11 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,500) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3a/events.patterns b/app/tests/hold-tap/tap-preferred/3a/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3a/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot new file mode 100644 index 00000000..87d1406a --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0xe4 +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (tap-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0xe4 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/3a/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3a/native_posix.keymap new file mode 100644 index 00000000..6f08689b --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3a/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,1,10) /*ctrl*/ + ZMK_MOCK_PRESS(0,0,100) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,1,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3b/events.patterns b/app/tests/hold-tap/tap-preferred/3b/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3b/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot new file mode 100644 index 00000000..7455d2a3 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0xe4 +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (tap-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe4 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/3b/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3b/native_posix.keymap new file mode 100644 index 00000000..392d328b --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3b/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,1,10) /*ctrl*/ + ZMK_MOCK_PRESS(0,0,50) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,1,300) + /*timer*/ + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3c/events.patterns b/app/tests/hold-tap/tap-preferred/3c/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3c/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot new file mode 100644 index 00000000..3d7eaf1a --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0x07 +ht_binding_pressed: 0 new undecided hold_tap +kp_released: usage_page 0x07 keycode 0x07 +ht_decide: 0 decided tap (tap-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/3c/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3c/native_posix.keymap new file mode 100644 index 00000000..77306cd0 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3c/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,0,10) /*d*/ + ZMK_MOCK_PRESS(0,0,100) /*mt f-shift */ + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3d/events.patterns b/app/tests/hold-tap/tap-preferred/3d/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3d/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot new file mode 100644 index 00000000..059d99c5 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot @@ -0,0 +1,7 @@ +kp_pressed: usage_page 0x07 keycode 0x07 +ht_binding_pressed: 0 new undecided hold_tap +kp_released: usage_page 0x07 keycode 0x07 +ht_decide: 0 decided hold (tap-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/3d/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3d/native_posix.keymap new file mode 100644 index 00000000..14413311 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/3d/native_posix.keymap @@ -0,0 +1,13 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(1,0,10) /* d */ + ZMK_MOCK_PRESS(0,0,100) /* mt f-shift */ + ZMK_MOCK_RELEASE(1,0,400) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/events.patterns b/app/tests/hold-tap/tap-preferred/4a-nested/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4a-nested/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot new file mode 100644 index 00000000..a8cf4907 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot @@ -0,0 +1,10 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (tap-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +ht_binding_pressed: 1 new undecided hold_tap +ht_decide: 1 decided tap (tap-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x0d +kp_released: usage_page 0x07 keycode 0x0d +ht_binding_released: 1 cleaning up hold-tap +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap new file mode 100644 index 00000000..c10c6d64 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,200) + ZMK_MOCK_PRESS(0,1,200) + /* timer fires */ + ZMK_MOCK_RELEASE(0,1,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4a/events.patterns b/app/tests/hold-tap/tap-preferred/4a/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4a/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot new file mode 100644 index 00000000..92a3569a --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (tap-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/4a/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a/native_posix.keymap new file mode 100644 index 00000000..ce163f53 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4a/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,200) + ZMK_MOCK_PRESS(1,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4b/events.patterns b/app/tests/hold-tap/tap-preferred/4b/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4b/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot new file mode 100644 index 00000000..92a3569a --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided hold (tap-preferred event 3) +kp_pressed: usage_page 0x07 keycode 0xe1 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0xe1 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/4b/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4b/native_posix.keymap new file mode 100644 index 00000000..7abda41a --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4b/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,100) + ZMK_MOCK_PRESS(1,0,100) + ZMK_MOCK_RELEASE(1,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4c/events.patterns b/app/tests/hold-tap/tap-preferred/4c/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4c/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot new file mode 100644 index 00000000..bc8aa8e3 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (tap-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap diff --git a/app/tests/hold-tap/tap-preferred/4c/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4c/native_posix.keymap new file mode 100644 index 00000000..ce030af3 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4c/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,10) + ZMK_MOCK_PRESS(1,0,10) + ZMK_MOCK_RELEASE(1,0,10) + ZMK_MOCK_RELEASE(0,0,10) + /* timer */ + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4d/events.patterns b/app/tests/hold-tap/tap-preferred/4d/events.patterns new file mode 100644 index 00000000..fdf2b15c --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4d/events.patterns @@ -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 \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot new file mode 100644 index 00000000..b106f136 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot @@ -0,0 +1,7 @@ +ht_binding_pressed: 0 new undecided hold_tap +ht_decide: 0 decided tap (tap-preferred event 0) +kp_pressed: usage_page 0x07 keycode 0x09 +kp_pressed: usage_page 0x07 keycode 0x07 +kp_released: usage_page 0x07 keycode 0x09 +ht_binding_released: 0 cleaning up hold-tap +kp_released: usage_page 0x07 keycode 0x07 diff --git a/app/tests/hold-tap/tap-preferred/4d/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4d/native_posix.keymap new file mode 100644 index 00000000..54676600 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/4d/native_posix.keymap @@ -0,0 +1,14 @@ +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS(0,0,100) + ZMK_MOCK_PRESS(1,0,100) + ZMK_MOCK_RELEASE(0,0,200) + /* timer fires */ + ZMK_MOCK_RELEASE(1,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi new file mode 100644 index 00000000..e514fa65 --- /dev/null +++ b/app/tests/hold-tap/tap-preferred/behavior_keymap.dtsi @@ -0,0 +1,27 @@ +#include +#include +#include + +/ { + behaviors { + tp: behavior_tap_preferred { + compatible = "zmk,behavior-hold-tap"; + label = "MOD_TAP"; + #binding-cells = <2>; + flavor = "tap-preferred"; + tapping_term_ms = <300>; + bindings = <&kp>, <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + + default_layer { + bindings = < + &tp LSFT F &tp LCTL J + &kp D &kp RCTL>; + }; + }; +}; diff --git a/app/tests/hold-tap/zmk-modtap-proposal.odg b/app/tests/hold-tap/zmk-modtap-proposal.odg new file mode 100644 index 0000000000000000000000000000000000000000..82f84369d4cba1d75c4dc16e3064fbdab1ed225b GIT binary patch literal 23148 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 JA(NlI{{!HqraS-u literal 0 HcmV?d00001 diff --git a/app/tests/hold-tap/zmk-modtap-proposal.pdf b/app/tests/hold-tap/zmk-modtap-proposal.pdf new file mode 100644 index 0000000000000000000000000000000000000000..33048ca1d64eda9816137c4a01f255ab64badbdd GIT binary patch literal 25493 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 X*2Dq(%k)r~h@c1=8=IUeg6w|)Oj +#include +#include + +/ { + behaviors { + ht_bal: behavior_hold_tap_balanced { + compatible = "zmk,behavior-hold-tap"; + label = "HOLD_TAP_BALANCED"; + #binding-cells = <2>; + flavor = "balanced"; + tapping_term_ms = <300>; + bindings = <&kp>, <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + + default_layer { + bindings = < + &ht_bal LSFT F &ht_bal LCTL J + &kp D &kp RCTL>; + }; + }; +}; diff --git a/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi b/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi new file mode 100644 index 00000000..375ffd93 --- /dev/null +++ b/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi @@ -0,0 +1,29 @@ +#include +#include +#include + + + +/ { + behaviors { + ht_hold: behavior_hold_hold_tap { + compatible = "zmk,behavior-hold-tap"; + label = "hold_hold_tap"; + #binding-cells = <2>; + flavor = "hold-preferred"; + tapping_term_ms = <300>; + bindings = <&kp>, <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + + default_layer { + bindings = < + &ht_hold LSFT F &ht_hold LCTL J + &kp D &kp RCTL>; + }; + }; +}; diff --git a/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi b/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi new file mode 100644 index 00000000..e514fa65 --- /dev/null +++ b/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi @@ -0,0 +1,27 @@ +#include +#include +#include + +/ { + behaviors { + tp: behavior_tap_preferred { + compatible = "zmk,behavior-hold-tap"; + label = "MOD_TAP"; + #binding-cells = <2>; + flavor = "tap-preferred"; + tapping_term_ms = <300>; + bindings = <&kp>, <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + label ="Default keymap"; + + default_layer { + bindings = < + &tp LSFT F &tp LCTL J + &kp D &kp RCTL>; + }; + }; +}; From 29a23f018235ede8cfe65f5ede5014408eee879a Mon Sep 17 00:00:00 2001 From: Okke Formsma Date: Tue, 1 Sep 2020 16:04:58 +0200 Subject: [PATCH 19/25] Add tap-hold docs, update mod-tap docs --- docs/docs/assets/hold-tap/case1_2.png | Bin 0 -> 10323 bytes .../assets/hold-tap/case_hold_preferred.png | Bin 0 -> 6380 bytes docs/docs/assets/hold-tap/comparison.png | Bin 0 -> 158912 bytes docs/docs/behavior/hold-tap.md | 62 ++++++++++++++++++ docs/docs/behavior/mod-tap.md | 27 ++++++-- 5 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 docs/docs/assets/hold-tap/case1_2.png create mode 100644 docs/docs/assets/hold-tap/case_hold_preferred.png create mode 100644 docs/docs/assets/hold-tap/comparison.png create mode 100644 docs/docs/behavior/hold-tap.md diff --git a/docs/docs/assets/hold-tap/case1_2.png b/docs/docs/assets/hold-tap/case1_2.png new file mode 100644 index 0000000000000000000000000000000000000000..818ac83752dd0c47c590b015ca18923797981c42 GIT binary patch literal 10323 zcmdU#cTg1Hw(m!goJ4X~6i_7R=qN!z2?{@wQL+*RNeVcUbIx(ddB`&4obxae zh9PsCbLzf(?x|nB`~G>a>QM#LQ*`g{y?gDo*7vhk*gF+@Vgfn>5C}x9s35Bb0^M-~ zj!*D#fWPfYMfkwSJ!fgfzwm&cPk3gbAkagQqU@``JboePJ@vl3F5DbU>P*R*QI0&g zPu)sP=-4(tkUd7{`i36n+MVQGP|hUa?mU_K>mtS4CFf`UhNULL%W|C`VKFhX5)R9- zzz+;x3S5fvZ(Vj6LXpPuJG>fNZe71P^EeHe#59zkHpMspZ1iJ3M8UUR#K~ebSChJC zX-6K1LmO&(hI@9lowBe;bEUJs!?{JfD#pb?$5Et~8&gbkV_bI)Ay=YrxqKdE$%*@3 zih{_<$e2p9%rCrd@R`p23hyZFKWJ+*jioruFruC;C@3(Qt+C6>&K9x)m*BZ*jgNlV zn{)q_d|~bPh|N803Ea*0yS7mJ+AGUlPtW>yhMet8RoL2^Sz}{kBG~Umd3iYn71d$y z<8RU5zstRTjq~c&D>DlVe!uHaPR`D|ToMjTAP`$znCtEY*@FktUS8sa)ZCqB{Cw{F zdR~})WgQ*bs|yVKvuE2C)u$I1l@80&?HwJ@xVbk1aG4&mvxgiXyJTc!D5$7dpm)YU zfBsx%In2bS{IfHdm_9Tz(tNJYaqx;?c$!qE8B%*P=WUZAeJ!5hKHb4#=k})0E`__p zT-+6@SPf6$hvM71T{{nTfEus-AmzThA{3O2tFnr$aXHst-N-}^M|UGa!*@oO_(2g} z?eN$)_BU{vq1ob3m#A?H#^+|ed9w;C`yGVCV0mct-S!Mq9^L*GOaj?#v53h0SOPLB zsS&+!QDsA|r1L$_I1^&I+O7PnRyR@5TC#8wl0INzd{~uqxwoI{gzz^WJbPg9yZ*JW zf!i8I<>Oo$e<-Yaa~Y-{8bRVDZ#63YbV{ms*@5?nx@F}g^(rCvtz#0zef^z>=(jX_ zLQ%Kl`^-GoxX4V18EW6|motvz{(zOWHAB&yL2G(Y?o^qVfTO;*U>#AbZTUM59e5uS z+suMFz2HzXT%hbWO^rq2)OVwlFAc z(m?U32Yek<@4RUu44r?M?(s8lK8S$?_w1q~(d}*E?L;zC+SWEU_{|jV_W$tdz(qAn zYirY}N}(w#b0b&wrYqMrHvz-JXApbP+q(a%3bNSTX8umX1nhS$+2qAK!ZQ(Zv^ng2 z>B0PfoIETls@wAuE*uVj!ZzVY?5F*9v!)UcA3yzV0=Fyj0)uM#xF`&b?CiWZM4iQF z+V`-rsY$2)NqSck*wCD5#di98N0X%<%?+P0@bL00H<|q`2n51&ue^t14=3A*I)Q+M z#G)+_`*>$OB3&lra4k-i-(l(H>nH}eO=(m28axg@IGEkg@KYHoe9%d*TIP3ijgz3? zH`&U%>Lp< z%Hg5Y=;)|+jjc`-I!7rf5N>w(^2>e#jk*LsL@BW!E%Vrow1G)}Z`4I&TjPl& zuI}*b?yt0&HdDk(?5a|E?G~23SZ}wJC{}MzBRu4*^wfF*HE5niWGg&RBZGyUoqCWl zP%LfpXMKtIxGE>D6q?%~ttssn5f)1G^i7iy1!%nC{86BG+f9O8FDe}gvcK1&&z=r*uhMYSklx0(qHT$FBC zSyB5=+ZAy1d91g^OcmPr;SZnnP!$<0*sA(LUEikKxDZ#~{7^A+xbW%+`(61>S6-V2 zt6oUKYXz^l;d4mC@|CWTu<%{@yz^pnfnBo>=8<9Z**!if9H&i`L6NTS^_-Pv3q~-c zvi7}>rgZI?F6~7>Sg0YV@b^1IGCuqw{Yxz`qNL8Pq?^?rzH)Sj`$Cq7 zPbn6KkvrA8oM^DPM6*YN)GnCKal~$tVyEQC!7z32^r4u+i|fu4mB&vrO!a3A+^?li zx+&*ccsuNT<^|80qBbp$kPYAPTGHv^nfp$PhAdjZL;3C3Z}#^0-&*g|l9BuP6D>Fo zZz3HmQi}dXy-ArRL@%Hg04sz9{I<%y{Ad>YJs<`+YQL5da z-!932eRemX4N1#)71PbEM1IU58J1Ork8bA5-&$eAJe?lhZgD;l#+qH z<2$BjwQG;X#97hoPdK`>ufheh-aGGM;Sd=Or$`Z?soJ+)?jxM<=SDH5iGnX;catSt zzdo*)sDJbbd+vCkb{zFWIkM^Jt2n=)T0;TwMYmbIZH*DX{-t9{i6rUE*|LZh(((7E zo2Tgv2|pb2n?GI7@NThV)J<#4-QbnnNcA-}Iw2EgahE*UPPENZUO6Hgh38c3`)VS1 zz3Q9dM~9}p$mgxwPnuD@1Shs`o{T*wsEv0MR5QVHaU*`VO(%#ixYOs;PzE?W>vB(V zfaY_X6?6?>(%_Oy#cE;KC)kP1P>Sf+X%kj{;jn->UuBns7p}Y4 z9#L0_1g1xpyO?j%2I3GZkYf|>>MFCsNzO1RuYC4&cEAj@e~FCfJZ6~MGHuZ_jAJ^N z0O4anOjkpAoE{J4HpKX6P(HZnNwP-Lh9tW z5JRWroKvsC7SL9VaJg`_AF!ek?$@G`MZ~E~zzrwk-*;jdgW)F2yBhu4mt#aK3`51W zs)e)<>8ne+_r<*~=XL_riGx(JqxQH<&}x*SI+!Igz2~IHL?whA zvIttah%!QL_{CvdaSnV!469V$FVy~e*2jLGLw1T&)wS(XSA&xq)TnP0FcW=IUYyz- zFt4e&gRG==+4KQhd&i+~&LwnzwDj3wz|QYy4+0rD`rag>6V^{_i+%Kp=QX=V&jg+g z4O?JlNNLUyi^AIKm@z&VRYsYiA1=0(>&J92l1TJpcV}cITsCH1nT^qh7JuT!l*KNe zpSZsIw76_*aLsYSuf?~s&;uRI?fw3-(;lQ4WGx@0L;oUw@<;W7I_LrJ!p4tgRYs|o z=4WD!K3I6WG=`;3YqF0(j4*WZq}$OHt&;DlIgYANnSrjkCw}I>PZ9T6x*Nsf6)Zm` zE(BA*bN{E@De?TD6XLXt;{o%Vnfs2|*swcuiScisOL&LPLuna%w)0N%k;%WfwohyD zSxPWQwZ}dMyrlloTT@=_JOK@bFNJ-N)tX)kK)L1;6W_e^=<%98!^R<}oUB|p^hcFU zmWmtBboN0L;I<_a2@X3SQ$h;KGS$oI{o!V8#;qQJ9i7;#lBpE|S^8j9c1@k=mEpgh?!(MsblncM`Vsz6TXT{743l_AkQ%7}- ztG^k1#4Gr~e-zQhR3iITrOp2SqG}IksqT*^N9?6$D;kil2GZQupxKwW2KS4*S$AAN zjYp5q=hr=sJ6m_$eCrdxrT9fBFw?=izZtYI=jGQXPun``4yLRicS%3p{0ys$P)VVa zRdC^qDOaRmoa@NX#QjJBoJy?^2fShDt9|-nERVCX zs4IQ6c3z$adddoh-;&X=TA zWZ1GWudk13z%U1O?Z_?cqt}ohaM{Siu)1N@!>!RX_2^NA9D0VM|Ls(zujf4RD=^jM zbK;0`D4n;^=5Vr`O)|0LXyfCpQT6K5_t5B23#3*FSWAjhU0;8&NT-tfgQlh?&RDR! zk&)5-p~!*<77q^(_4lV*{UQ%T>lS20%bbaGeJ<vHG!Kw_o`VHK?byM1W zUJy7h^8j~#sCnS~UmEfC=&Wt*bVl)8cQ<~frozz2nxT$q5C+~<@bz)+r|OSPZ#Qp# zo$!U-t8F1;R~e#W&JYFD$4w9X*={Ly?MoN=tc$Y(&p0ZKo?gT}eE65IA$@(?H9q``alzWi>w(LRq#Q8BZP zo!xEBv#3leZ@DCYPJML->mk>=?}zx~wX4HfLjP-Tv79ci35ybuttuE%7YO&{vf|=? zZ(Qlzk9zSCol}y+ovj$PKMNoAti&UVT%%U?n<>hKxO<|)yaC&Ki6T>nHu8jI22V0K zM*{XSCxt=cKpGojLxm02_Q37*-{xl4ygE-m+^D8`=!F1DOXA44QFS>pA9v&@8%-U9 z_OOn6S=asb*ei30-mC3x79h;F3p4bpmVHV}ds6xFF0cczWa_rd)xnti5$s zkPq7*fVWeAeT5BpZzAYP8DRl=JwI@b?8lIyEafDb>1pz!4}yz`bwT*jGgAI5zXfM_ zvu3l@x5G+yT1j+U!}CztIpsEPZfC^S?Nn}q+0;Q7EQPygmA}O!qzQVXtTrPH1j#|f zdatW2kVW=BWmoOGayk5q4#-l;$b#ONMf~^VaI@SydfF_bpy1~zo}p?23s-W-D>vUG z@E!FJ?AS0|Pj8*Ag!^Gl8SOyUN$6fuMPxZ-vSbgOSnSX3PGN=pONBjI+;s&=;8VEe zKHM2B|F`k~Hu-Fb($AuF5M_{+m38Q0bk}oh^7jXA3?;w)`0=BF1{+t*z9gj;>*eJo z02Au=#IdolKOGH<5YY=4d4|VQDYkKszBxTTjZRGTn0Aegjs2NVX9XARxlL;c{&tf8 z{tzNh!>XjSv$Hw%8{(V1F=_?|DsSEpR9Xxky6B8bf9&KQCGh#vhHE=pLkt~!4Wvx? zq@)-Z#nHfj{A+!46N}g9+(k`YT}tF65*aD|&!M4pQ5*jyK>lUi|4FO-|8VMuq~Y2Pb&m>$ z++4yKs{S<>arD`JD>;j+Gv{Wwgd)8k#A5DeZ}Bre*)P~ehc3pWCQqlb{}ni`*Wcd* zk999XZ|a0%eqWh{5^3}rqA2!O)Bw{0EHSdGN>DXnG{f34J2>zvgyPTy?Q+M2GlGiC z1d*fsgq?kLeZA}Q>?kZUGP|rSTAs=Cb5Ri|KR-Vn0RfAEK-}5UW*ii%3z-hU!UgdH z!Be+3Dmwc9C<38V=kN%yOh7b^!rUQ!eSKStEnr1O#f0Ln#l_Swgwzk1m{c4c`ED&( zOiU~*HcP&1(Ny=BD~o z7g2M)FhCR6xfQQMaJCy7INt#{4Iz@%%ir;94F}FP$#D0Ck{(Qrq(f-nR zY9FGSx*exKG@m+A$^=I~O!pS4sBk{D9;XWolEEV)SZ0sQE!*9N;NeFuMM<#5eovNh zP!Mf7A2t-Qn{j!)D4ug>&|3J;uC#u~bvU`Ud?_fI^VG;vzxSJBWV%mT3;lBnRrNCO z=#J$jFtZntdTvY#cb7SdIb>bQ@kQ!hwNt~^Ly49TN=6@_bm3y6C9UZwvn?IQ#>&pj zDA-9hD|n9HwnMfifSJTi2hMA@1+O@qp!6bvBY3-HL+)3$qE+Jxk@dst2FV7rg!}Xd zVc)9g!&vfD>|oGHx--O@LFg~7WXs*{kHBTh%GHsj1b5-57^)M^IY5+=nAu+axJWe| zFDhOBzDD^&(2Krsd?2gsfCxDs6YA#6sZ;SeUp?1Ec(+~j@hAffcN*!2L&`LeqYRbQ z5AUa-q>O<=`=cMp0H}lZ@$0V-IXS=Prg()esbDQZ3bHYcD9^E>OlB@P> z?!8%y%9zB&-dig4l~&--$;rkh_(rU><=U&V$yaOjjq@J0cCp1i-S6bEAaTSq{`+y; z7h#EauyCSdVgkks%9F{q^(p`F;--D+L{%CJc_p*ih<3daW;!5JlF9FB#m2>9z5L%( zrt^c)CgA}XpYglRLK5d&7=$XQ5?9HM>tXi$b$aU2*Wa)B_N^(fDCh|&zj?T^d=Yi~ z9FkF)iJ?a5N+J9qB5>`le!R9cjq_K>)bv9qv5 zj^#erG3l)+JbO(>YZ3YKv-brX+F)E4Hx=J08Q5Q#oWmkaYeg4 z3pOgPIlvg^+%@8dCS6Us%v2G!>bocF#eVuFly27cM**Hqr-G_ZH3Tn3b%j%YWd=8wAP15JT#z&00Wax|r_Y+^fI(HNPDCF??`%z+U4{_lk^hcSf`6h`K_gWa;_~t^Mw9&Tou^Bp3>r^pOQb ztpby4!rSv$l)h_OsZM3E^X3qr_sL#_G^2HkuG7Iv*PK&7SL4|Rl)&xaX-lh-^`7vF z?de*0TM8f+7n<)R7He|!zuEc0o~``wnVobKni?z?Wa_yX&2P`K5~uv;*OzQBcS(Hv8~Q`|i()EnWCiA5Z{# zpW8=18ippU5a!JFQR+yA|G%SCo36;Wn}c^B0;u8BB^G?)m=**mL_cT}QEPIGPfTJ8 z7QN42!miDzj34ep<0U)W%RlBM`wK4}eNR{y*{viK^!HEO33))g-Y2$NNVT<}qSku= zs_fW7b}S5T17CdbI5m01*-2a0#FY=wKmG2EJhn5jdw2tkLWR0?qyr#JTMsz8 z&2y?T?F21mDS#(+`Nhg{q5QxDc6*Y&YmcCs{ z8JBM-5cMctweG>9i~dK(t)jqDmQ5d5Cz@9J+oL#8nRb&Rtw>zFqW~cK9F%)}>zlcG zpPo%-_c@XNDW}Up^f#@3La-l05&x$ z`t)IbN}4P-xIV|iCCLJ|Ag5vT9HmfLo$P4Z%x|NKVAY*!bGu6l|IUEg`fQZCJn1_f zUlM@MwTpL8+VF_I$9vghkH(c2`Ig+a7Gh}eXAF0@TH{9oFF?h1fSoLVFy8{*5%cs& zEhI_T`Mfwn3|!0cW?1i}l-TMQ8}`LYSA?Rna<=?8rcW2hT0kMy6>!I}!T6qi7j7e4 z^GSXsH$C039z`c1raO9IM=q;}YO~+I_{*3H^yqgvTE*b5t5$&RQiqt>0PHFEw;+t_u4u!V@>G=gz%6_FIxv%amb~V(&J#F?oNrLger{ zuE_EW2ppi%uC8`0$|n3tiZr}Tz$R;gB6fc;&ou>vS5yLMFsMFYcSt{d@7U2F2cmhG z1|W_1f@Pg-Z|oO79g|$64&b-m`LNj_WM0!1epN#pY3*?KWz_*4ujUNM`g>`|F6AN5 z`J!Iq!VueL=f~RvP?2x)%s%m?;LH1k8jEG@TnG$;Z&8)p0-|@P4nl|1s;S|fl$ua# z7=(Pa%$Rhr#*ee$$ejM$@z&ua8**=CZZfZ}hrF&h$V_k$wcfF_6xN;7tjzVeILBIS zu^4rUR9Q2;IiKV-XiUT=q;j~q!oV`w$P)0wqHftU-~>fok3n|QGtNen;(?D%L%;6+ zCZbH_o?Zb!48X^>!N$VomQm_umI4>iU^%p52Z>VC&cMjvOMKSvU9BsGld_K4bGIt=%fD{s2rYHXuHEF0RrJ( z-}VBW=&Gr;1KA!oY+o1B^rg$BvHqo1@+Yjo&|Rs|SQ3*CGdP zKAg__Kc+Z|%gH%tCXu2>CR} zu)2L00K$t5cZR>nCTsIO-g*x@*`M!U zXaWjE`}B~;bfW|+R>u+KUca8AhFp@a>Q96FGwA{^t^@u`=2`Dd*JBZPEwwp1AT`@k z_3PJ)*eG|o9=2kRQ*gMTcU)PsJ$M9^4S?DNQR?-DmwQozx{-tT-9YJQJYroi)j64u zE)0%7!6P47Q3>#(I>nm4M{?|-%6I%8o8MsyVh6qgPHP&Qyj z;vJvr?v>Xaxi?G^;}OItp0t9Dfm;k#GrYi3WO^yLNm!zxAxFEr zXz1UyGgxLt3QH3|dj!-p>A$#bDb2)-#V1R(7040$DJt9WdGrM--K1jlDoVdYhBJZs z(QQp&pMb@Y5x4+)Te1Vvme{6k0k=;FCAs|vbpt#LKwZZ#E?zjMxmF2acEMRdwha8T ztdRUYB=M06#!cc4Kq#h_rW8IN+&#?~_*_HSZt{C-D3oH4X>HX!z0bmO(%xq>Q?Rr> zBTn`+uIYHkIgw(5M7UlE4iU}E*RO+{Cq~nb-4p+NUH0!;M})Rqi44#x(s;g8c<#{4Glki`UHr$xx2VI{K~ciWq4dtTZo4aoU#l83z-c9p(YUVwSZs;ND2-WaIQE3T@F&wiUw z;f^x6)iMC0nkdrQe>!g`XhKbP7C`#q)ZcEl#<+5N3m{+1%gdl!?HR)4)!Q+y&lou+ zx7Hx=apWNm2}3B{tYGp-YAR{#@iqboUd6SILL;I2vLzC1arl+fb4F!a8X9-*)6spX zEy~FW?g$|j(e+WzCWD1miS|S>t{x48*+oPWVq+h0QV{|R^n{I#-=q_7rWRrdp|70& z3WSF70u7*0kV4L`VpOgj8Wv{U{u$q8f3DtsK6qow&1oNh!NLzSJD=5LwmLj@h|CKj1{39LCNgoM##@TZXN ze8cy}t9^Gs3>{=3fo>n|s*hwzNl7ld6Onm&Pe~X=TLCX42DJA8iGkf8>UQkEgMXP7 z6%SzZLqM}m*@xnzSs5>;2~Roe_U^1wQjEZz>l{}TMIB9=YJf-=tqQ)XvS0hu zw%if&jE844KR1Pim-oIupj1*kH)sh62zq;ajSkn~340=}tY6~eDS+9kn47c81QX?7 zWUFaw_X0Qjb9lHiB!O}{AcLg5dcei*=5Rq%Tdo&an&lgeCO#Y)^auo z`DZS2b&k#iR^zdJR9)#7)oXTDxh%P`uV3#OogJ=IP*WR@SqMWF6%;-?&^_Vhjh>pC z^6C!?3elB0dMHLSK7aXg5CXmo7%$YSw3`(sAS8Uo$$9&hPtVW!t;e2r ze`EeO{psLy$G00lDfO}lg@{!YYWVbEl@{zPX*rz2`uuqW0B6g+G4`58+OL4MP|s01 za7p6&;oB9a5HV4rF98^4uMcLv=L)k(+WJ$-CNDq#z`>j=;dX7l0_`Be_H(^JzDj3{ z`kjfZSx5<+SFy6P6409T+SnGNe9XcX3^y}@$Fhnht4K>rZ;fX6%OP*OE$nN_X=oIH z{xN7VH#0MH+KD69`uaMsp#^mpC#3=0$`#zw0tOa;qY1OHI&GPn4J@m;!AcS#q@eW_ZTN#y}Y> zI56-o3G<7u)3$6+pN0bBi_d9I!NkPmXEhrT4}cT28$I~gRZ}`GDu3syrdkxI^C=BY z@LN4$;YL*3X!#yN7sr(OLLIe>HIpSN$@u90y_e*Faw?a8q-ODDh2GNMK$jp$QBFm+ JMA|6uKLDAAvPJ*^ literal 0 HcmV?d00001 diff --git a/docs/docs/assets/hold-tap/case_hold_preferred.png b/docs/docs/assets/hold-tap/case_hold_preferred.png new file mode 100644 index 0000000000000000000000000000000000000000..6d7fd43bb58681629387932f0053995d7d5d0c33 GIT binary patch literal 6380 zcmb_gcT^MGyB$SALEs`%q**8dsVX%Bp<|HVLXU#L1`wpmrGtQ!fP^Me zBE5r@P(&~RLzCX}hWpxIzx(cQt(P_Hn^~Ee^__F}{=U7>ywKOxq^ISe1pt5^eqYTH z0M1H-*EJWY!PxZ{-v*w}d8@#UFMz+03y+@z0DBHxP1!ggolFQ0F^2ddS1CQ<0&?extMm(K437%J7?J z=WnC}i(yP>sLrUUgui+fd|x2p?QvvkL|wFYU(ehAL)eeUOCdA~v-^E=j(rs(+BVBf zK>2gMm!q4zSrX7^h|+^a2Y2gjwj4V^u~gHzFs$|vqJh6~!4Iw#O!Uj~2J(mR2^h9( zigR+et}MHxds8wqv!z3b%U*1?vY}qw7Agw@11}$!tDH<&7W=Fxf}Y66D`c^u2I!*3ErOc zmoS1McQifKRqq*_Ae`EZDJ2oV>M*$tqP8 zjW|dl>F}WDlM0fOvvRH)t&NVrcYRjreQz>0pylRgQ<&G)ZRGIzHDwwsNqNgzuY6R! z<6pis@G(xmRjid3YNM(e*@u)}h`Ub&978kWd8T;b2TP4;nX9IlE5lW2o?zltFlTX1 zjfPx7ypO;3p4`$OC_CLxh(LRETq}=A$!Kv2c2q__6HJd0W=kV*?{`e~yHc|C_^j`Z z?MI>-5tyxv=wz3@56y(!VcUwXg$+U1aRKs7y-7PltjhuGszkYQFv-0u{B&+zERZq7 zT+b#fUa@bca5xZeVr?xJ&1=@Ua6qbg%`6poMDUW0n8dC=qfV|tRVoKFIuuv`tW=3m zO_CKY6nn+E7V8E6PD+@)aH)p^~Iu1B17FE-sy$qqo@? zt(tI)S-Yp797F4~?UE$VgJ$6B8;UXM@AB|>+8O6@+e{ysCv~w0NAq=p{~S~YrYgE; z+S(mVuX{6SzM8S2#LUcY=G)pHIJK=;&@wO#c24sKEy5`1n3#V5&R`-j$dA0QFMhHL zfo_o)wqwX8FDv|=)Vxw-9*8+D9F~*vk|_C5NB8=%V|;B`POqhDNkfBLkr0W)cjcUk zapH0m;zT`)t>3rv&{anbUDz>?3#Mq6Qry%eTWK>sr$5vMX6CToZXORZ-t|V6V0SWD zZ~>%rF)L`nOyhy`e5hVA>MmYP6P=o?7)tH5+f-UP#f|$>GV8J9+s~G1s-u&4N~vuk z6FNm<3)8AdC8_n zX?-l|L($h7^CtXZBg;WBSm6C=^s1r0{_{+;qX+G~b$L(C!LpqEKx+0lXvDUIOBiyH z(KT5IPgC5>q3!$OGX3=`M|w)}b&c^rA&*C`N{5ch#a*~=4q^3loNIMn^Rd|U)EAAf^#u8??kmyL)5m3{ma(x; zs`}6Fi^7MHJE0>VS8Dia7#!i4Aq~C8M`rM$?-%c~%odQIx_PE}@2bW@h}?>}2f_%2 z633I{we8QsdakF~sP!q=S#1+A=a<^j_c)i%4fx_h&^pTV&d1{`&Bo?|6)F*}#+Hbj z+qF8Qdt3KB_v&=6HDw<~7~wo;{8@&p^ytdRjM3}&>A57{cP=n7De%LwNT|)MIk$N~ z=`NnHsC~ub66YN)%qjQ8tQBV;|7I;tIl_7d^U-TL`vqt%pHWHdWR6B7UdhgO?{p=2L@>?IR72HIOO)W zG_sqyFojv?HpBv-t`zL+Tu~PwgcL8g$`3+hEcILGPHE_llxHIUEPd-LwN%p?6C3Aw zG@+{LSJ?2U+WfphX@jkiLQYz*N+-HFs8q+}*u!-H42kj7-nV)z`&mFs4qQYaOsw|=1p4*{*A?3G9x=!0V zcfZ^_{@LRwa4l2iVbEKq(v~aZkr(LccTJB3LPYhh+v-X{ntH}h#6m?Gq4^JDd+XCE z?Tl=^Jw_kv1`QYdQvrB<2Mhq) zB@oUgzUbOrgG~+fA5Ku9%&%qb6s;)lS!61;f%O;iw*1)oz=Fp|J2}H{!E00)vilsI z3r92dI^51PEB||Tj_>l8f&0liJ$&d5*_9uj&@oFeDUlgrgLKJd^s%Dyn@%Px-#Lis z`YJ>pPd@anv+5P|T$2%K=yk!mY<+>_>?X10Q%jk0E>CXmQ7xVGKD%BcCM?a8g!t}P zKboUyoKU_k+OP&!SMP9|f~;TzyIr{Da1Y>-8r1=T?x&49%BrfFq~tVK07OAoqlZqHG{5=UKz$H=bsSPQAOOijzMiZZz)g8MVRxI{kg z!w^(ew_Zq?{t)(&&+$H0FZ@0`9~>H5L;A2DAP=4S48;vW?#Z|e)1XE=c9BM^sw=a7 zvTqNI_=-H&PHg(mQ}F+tTR>1yO{lfw3)y2JOZup+6LIw3wB++iP-RlPtx0E6ewLuh z3GNWv7l_?Rh=rx3JWc-T7afmkLS}{496qxLm2a}a9?R#v+!p+}!ptJHbg))8k&g`9 zdO=I8C!@H!5wLYKCSzjrG%t2o#`gz;^@~Fl$*M)D)NFeVI^Gi+*d<&>Y=kwJ5e{p# zF!{QvgRmbIgN7p& z=Kp%eVi#jtdV=D>NE$W<^A{H5R3Kgq#bv9-hS3EpYxzCSzpxtl@#6z6IX-uGpW6g1 zI@5E@8)n~_za^VhvKb?Mu)K9xO=^`Hd5bQg950nyHrkOtR$o1+@AMvl-GDRBP*g$F zRtp6eJ`=T%UmoPuGGMw5Dn)UjhzZ!|KwShEbBXZFX#rvKdyNDng*jXX>?1Eo6P7Tm zO-}dz$#-^;9nwI-y>bN}f~Ao_-%vHYYVTC$v0cCgR@K1+x<%;f(46lwzIeRR`yPKRD$Mjg?_J1eXl@sv=|@Ve-# z7FXh*gy34@FQaJRqCzFM*iHVxE0-^qDcAD366aon;$9G>f%lcAJIm%BA$KMq!T!;v zq28owZS8Ra0L}H+&W%Caj4?NpGt(|}ERNc9Ci<^d2Ju(TpG{@vW-4oVFMqsMijstC zDb1BV27phJg5c)jljO^K`8+m|UKKL|hfxeL@z5T`)~BPj;2TT;vNav(=}c_T_sp`C z44rIXfO#sNO&*{=d*1u31jL9nEo|e(GFz6D&m}A@yFvfDUTS+Wev3=!GG`(s|x8D%trmuDiq-2fomS^sb2*EoiO%VAbz8UhhY~15R{&d6`pke?!WRaX_GUid-M;7QyXD5062p%(8>8mh!Yn zlVKrUM0Vhb(KHV_B9go7KBt4vmA#MPoxX}Q0I;Nd8uR~IB<1SC%*!bh##&cG`863R zEpYwQ2YQ#Q?cm-r3EW{3iI78XIRjth|`qFHC7ujMD57wEw1{ z#p9nm_!L_^dx{ z_kD4(7DO-8xZI}kW&F3=bln15J3A9&48=6O*Fs z>=v+6TEA@s$ZJG9^?hrP-JS_v6H-*1AqpxL7@L|F=jOI~M&F(j)_U+j%4I~bnZPqL zHdb6+ZM?s~uc3MIf?_>hKuk>cu4A9Eg+=P1LAdTkdU_L6(>H^+f#x56^(-tbd3c`S z9-?5zWiGDw+biRo+`JE;#Q&Sz%4$@)=F#^%70uRiN%^hYw+-}Q$3FF$2^krs<4BZs zQBjda<>OBJ?pwmb+hdlVq_!8##bsrtK|wg4!0$|+YBb?u?edpIepV>gzqhQ_4c=W% z8YYc=dCkkYHjj1a<)@aQ@czqS8!6=S_w}uqmec$-IjF zp&~3(JwqUoTFHv-C zTP-x#1R)U3#l^)+aGw_wGxVH^S2FYf6q(_IPH)gZfWlVeK9&FTr<-+C2)OsxiKM0< zN|*DN3|OD*$Z}sz+3ZRZ#(K^+b!3@0h1Bs0L7^7*_VyUQcHX}PbJ7dsjgoj6&Zn|vt^t6?zHLiN%%zD&dj;64*wCOd}QH6`EYtrl2 z*+in#=-61-qL(v1p1X32oO;{tS+1+UJq_S#%k!ty6;9a34;aNjM?cbbT0 zb6BIa`{c+Te4Y+u4~WlLRlj1%^XC`fhM}R2Z^V&h4Gr?(yqr&t_C?EN6cnsUB+_K9 zXBL=K%6ECB|bZ&cMn_1kNGtW|m;@Pw-8qX5ji7 z;Bc~CTvD=qyoPGtK%3!qitML9KJDu6Hd0ppeOHAloK1ppkVBVehdK0cCyB4|aJ3%i zLmHy*1|cytG)yIsuQD-Zx3#qipf%Oi;g~X;#^tDLU{0Y&wfdQYbeQexbR9HsGgmiD zvDCi%jnIu7%B|6i2raD`@a^wUWK%brr(U{Yp<1!Q{PgKl ziyF7LHJ-C&jlsLcA3o?uMMX{4xTmS8sQBQy{hh|%n^#(RPG8(zq)-DWyu6w#2r8e5 zh<24j@6dbmDzG^7?eOuWfoxT%*Z1e(awvd+xU@u^*TA0x%E49PA3?xaxVcMTFhiDu zXAd)ZP)ASUh7Jz-92^{%bg2PCY~b@11Ggh3Utg@>>U0sI-e0Ev2&|qYf=6=qq9KTc zOu@oO$cNKC7no$4y?|dQrraCm(WM zliA9_;tL1}s4eAGdI<7C6y(EitgQL_zkaxGFOLST*8PxtGN-h?O0dKj8yn|>xSN-n z5>S+5LXekLf2IP<)vHA@F|@}=KVS$Il?aVEjyxfwd>>0{;P zr+fwrO9%!-nwFRt7#MKKc%(b@q+}~cQv13JfZv2Pc>>iuoA&c#Vq+J5pi)6wM2}wJ z`uZvKv3O0!3u4wdV|8_Pu)%@fDhGtJv$MOpx`tv{gkQ#=-NRxqmvz#lOE(-6PXuIT z%~rnWOnS zX^Dx6kA1E*&w16QTG3qqj^d`srXWB3)@Iy6e;*P^}qx?V1kb3FFLp<^AUVPckT@RWuRJW3jQ)sC16!>%LnLZp-w=x z;OB3jQv-l1yQyL67#+x|#>mOZ#XNsLu(z=w<@eJphxZJi9q+CO`lpQQhb?DC%|3hr mooP7mxu(GV@9|$iohi1|Kd)x?!W{gf55U!R)yh;JM*IgwMIW93 literal 0 HcmV?d00001 diff --git a/docs/docs/assets/hold-tap/comparison.png b/docs/docs/assets/hold-tap/comparison.png new file mode 100644 index 0000000000000000000000000000000000000000..419b2040015ecf851e6605950e9e1a48472b8094 GIT binary patch literal 158912 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

v=mX|&cA`aBl<}f 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

PS-t8+}tN=<%$fuLj)8^>@g5<-1abqat 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 literal 0 HcmV?d00001 diff --git a/docs/docs/behavior/hold-tap.md b/docs/docs/behavior/hold-tap.md new file mode 100644 index 00000000..b586b90e --- /dev/null +++ b/docs/docs/behavior/hold-tap.md @@ -0,0 +1,62 @@ +--- +title: Hold-tap behavior +sidebar_label: Hold-Tap +--- + +## Summary +Hold-tap is the basis for other behaviors such as layer-tap and mod-tap. + +Simply put, the hold-tap key will output the 'hold' behavior if it's held for a while, and output the 'tap' behavior when it's tapped quickly. + + +### Hold-Tap +The `tapping_term_ms` parameter decides between a 'tap' and a 'hold'. + +![Simple behavior](../assets/hold-tap/case1_2.png) + +By default, the hold-tap is configured to also select the 'hold' functionality if another key is tapped while it's active: + +![Hold preferred behavior](../assets/hold-tap/case1_2.png) + +We call this the 'hold-preferred' flavor of hold-taps. While this flavor may work very well for a ctrl/escape key, it's not very well suited for home-row mods or layer-taps. That's why there are two more flavors to choose from: 'tap-preferred' and 'balanced'. + +![Hold-tap comparison](../assets/hold-tap/comparison.png) + +### Configuration +A code example which configures a mod-tap setting that works with homerow mods: + +``` +#include +#include + +/ { + behaviors { + &hm: homerow_mods { + compatible = "zmk,behavior-hold-tap"; + label = "homerow_mods"; + #binding-cells = <2>; + tapping_term_ms = <175>; + flavor = "balanced"; + bindings = <&kp>, <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + + default_layer { + bindings = < + &hm LCTL A &hm LGUI S &hm LALT D &hm LSFT F + >; + }; + }; +}; + +``` + +If this config does not work for you, try the flavor "tap-preferred" and a short tapping_term_ms such as 120ms. + +If you want to use a tap-hold with a keycode from a different code page, you have to define another behavior with another "bindings" parameter.For example, if you want to use SHIFT and volume up, define the bindings like `bindings = <&kp>, <&cp>;`. Only single-argument behaviors are supported at the moment. + +#### Note +Astute readers may notice similarities between the possible behaviors in ZMK and other firmware, such as QMK. The hold-preferred flavor works similar to the `HOLD_ON_OTHER_KEY_PRESS` setting. The 'balanced' flavor is similar to the `PERMISSIVE_HOLD` setting, and the `tap-preferred` flavor is similar to `IGNORE_MOD_TAP_INTERRUPT`. \ No newline at end of file diff --git a/docs/docs/behavior/mod-tap.md b/docs/docs/behavior/mod-tap.md index 08e9b65b..cbe95e42 100644 --- a/docs/docs/behavior/mod-tap.md +++ b/docs/docs/behavior/mod-tap.md @@ -5,13 +5,9 @@ sidebar_label: Mod-Tap ## Summary -The Mod-Tap behavior allows varying the effect of pressing and releasing a key position depending -on whether it is used with other simultaneous key presses at the same time. +The Mod-Tap sends a different keypress, if it's tapped or held. When you tap the key shortly, the first keycode is sent. If you hold the key for longer than 200ms, the second keycode is sent. -If pressed and released independently, the Mod-Tap behavior will send the press and release events -for the configure keycode. If pressed and held while another key is pressed and released, then -the configured modifiers will be applied to that _other_ key press, and no press will be generated -on the release of the Mod-Tap key. +If you press another key within the 200ms, the 'mod' behavior is also activated. ## Mod-Tap @@ -20,7 +16,7 @@ The Mod-Tap behavior either acts as a held modifier, or as a tapped keycode. ### Behavior Binding - Reference: `&mt` -- Parameter #1: The modifiers to be used when activating as a modifier, e.g. `MOD_LSFT` +- Parameter #1: The keycode to be sent when activating as a modifier, e.g. `LSFT` - Parameter #2: The keycode to sent when used as a tap, e.g. `A`, `B`. Example: @@ -28,3 +24,20 @@ Example: ``` &mt MOD_LSFT A ``` + +### Configuration + +You can configure a different tapping term in your keymap: + +``` +&mt { + tapping_term_ms: <400>; +} + +/ { + keymap { + ... + } +} +``` + From 081ae84d0ed4e5fd5a90e9a5e279cfcea55e81b4 Mon Sep 17 00:00:00 2001 From: kurtis-lew Date: Tue, 1 Sep 2020 20:22:11 -0700 Subject: [PATCH 20/25] Added Iris Shield --- app/boards/shields/iris/Kconfig.defconfig | 14 ++++++ app/boards/shields/iris/Kconfig.shield | 8 ++++ app/boards/shields/iris/iris.conf | 0 app/boards/shields/iris/iris.dtsi | 51 ++++++++++++++++++++ app/boards/shields/iris/iris.keymap | 56 ++++++++++++++++++++++ app/boards/shields/iris/iris_left.conf | 2 + app/boards/shields/iris/iris_left.overlay | 22 +++++++++ app/boards/shields/iris/iris_right.conf | 2 + app/boards/shields/iris/iris_right.overlay | 26 ++++++++++ 9 files changed, 181 insertions(+) create mode 100644 app/boards/shields/iris/Kconfig.defconfig create mode 100644 app/boards/shields/iris/Kconfig.shield create mode 100644 app/boards/shields/iris/iris.conf create mode 100644 app/boards/shields/iris/iris.dtsi create mode 100644 app/boards/shields/iris/iris.keymap create mode 100644 app/boards/shields/iris/iris_left.conf create mode 100644 app/boards/shields/iris/iris_left.overlay create mode 100644 app/boards/shields/iris/iris_right.conf create mode 100644 app/boards/shields/iris/iris_right.overlay diff --git a/app/boards/shields/iris/Kconfig.defconfig b/app/boards/shields/iris/Kconfig.defconfig new file mode 100644 index 00000000..bf4919ac --- /dev/null +++ b/app/boards/shields/iris/Kconfig.defconfig @@ -0,0 +1,14 @@ + +if SHIELD_IRIS_LEFT + +config ZMK_KEYBOARD_NAME + default "Iris Left" + +endif + +if SHIELD_IRIS_RIGHT + +config ZMK_KEYBOARD_NAME + default "Iris Right" + +endif \ No newline at end of file diff --git a/app/boards/shields/iris/Kconfig.shield b/app/boards/shields/iris/Kconfig.shield new file mode 100644 index 00000000..370bd222 --- /dev/null +++ b/app/boards/shields/iris/Kconfig.shield @@ -0,0 +1,8 @@ +# Copyright (c) 2020 Pete Johanson, Kurtis Lew +# SPDX-License-Identifier: MIT + +config SHIELD_IRIS_LEFT + def_bool $(shields_list_contains,iris_left) + +config SHIELD_IRIS_RIGHT + def_bool $(shields_list_contains,iris_right) diff --git a/app/boards/shields/iris/iris.conf b/app/boards/shields/iris/iris.conf new file mode 100644 index 00000000..e69de29b diff --git a/app/boards/shields/iris/iris.dtsi b/app/boards/shields/iris/iris.dtsi new file mode 100644 index 00000000..f6e32c40 --- /dev/null +++ b/app/boards/shields/iris/iris.dtsi @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2020 Pete Johanson, Kurtis Lew + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <16>; + rows = <4>; +// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | +// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | +// | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | +// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 | | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | +// | SW29 | SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | SW29 | + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) +RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,2) RC(4,9) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) + RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + }; + + bt_unpair_combo: bt_unpair_combo { + compatible = "zmk,bt-unpair-combo"; + }; +}; \ No newline at end of file diff --git a/app/boards/shields/iris/iris.keymap b/app/boards/shields/iris/iris.keymap new file mode 100644 index 00000000..4607adf0 --- /dev/null +++ b/app/boards/shields/iris/iris.keymap @@ -0,0 +1,56 @@ +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { +// ------------------------------------------------------------------------------------------------------------ +// | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | +// | TAB | Q | W | E | R | T | | Y | U | I | O | P | - | +// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | +// | SHIFT | Z | X | C | V | B | "[" | | "]" | N | M | , | . | / | SHIFT | +// | GUI | LOWER| SPACE | | ENTER | RAISE| ALT | + bindings = < +&kp ESC &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp GRAV +&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp MINUS +&kp LCTL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT +&kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp LBKT &kp RBKT &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT + &kp LGUI &mo 1 &kp SPC &kp RET &mo 2 &kp RALT + >; + }; + + lower_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | +// | ` | ! | @ | # | $ | % | | ^ | & | * | ( | ) | ~ | +// | | | | | | | | | | | _ | + | { | } | "|" | +// | | | | | | | | + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 +&kp GRAV &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp KMLT &kp LPRN &kp RPRN &kp TILD +&trans &trans &trans &trans &trans &trans &trans &trans &trans &kp MINUS &kp KPLS &kp LCUR &kp RCUR &kp PIPE + &trans &trans &trans &trans &trans &trans + >; + }; + + raise_layer { +// ------------------------------------------------------------------------------------------------------------ +// | | | | | | | | | | | | | | +// | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +// | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | +// | F7 | F8 | F9 | F10 | F11 | F12 | | | | + | - | = | [ | ] | \ | +// | | | | | | | | + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &trans +&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &trans &kp LARW &kp DARW &kp UARW &kp RARW &trans +&kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &kp KPLS &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH + &trans &trans &trans &trans &trans &trans + >; + }; + }; +}; diff --git a/app/boards/shields/iris/iris_left.conf b/app/boards/shields/iris/iris_left.conf new file mode 100644 index 00000000..1e028a78 --- /dev/null +++ b/app/boards/shields/iris/iris_left.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/app/boards/shields/iris/iris_left.overlay b/app/boards/shields/iris/iris_left.overlay new file mode 100644 index 00000000..e04638e3 --- /dev/null +++ b/app/boards/shields/iris/iris_left.overlay @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2020 Pete Johanson, Kurtis Lew + * + * SPDX-License-Identifier: MIT + */ + +#include "iris.dtsi" + +&kscan0 { + col-gpios + = <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 10 GPIO_ACTIVE_HIGH> + ; +}; + +&bt_unpair_combo { + key-positions = <0 42>; +}; diff --git a/app/boards/shields/iris/iris_right.conf b/app/boards/shields/iris/iris_right.conf new file mode 100644 index 00000000..990cf7c0 --- /dev/null +++ b/app/boards/shields/iris/iris_right.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/app/boards/shields/iris/iris_right.overlay b/app/boards/shields/iris/iris_right.overlay new file mode 100644 index 00000000..3f3dcb85 --- /dev/null +++ b/app/boards/shields/iris/iris_right.overlay @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2020 Pete Johanson, Kurtis Lew + * + * SPDX-License-Identifier: MIT + */ + +#include "iris.dtsi" + +&default_transform { + col-offset = <6>; +}; + +&kscan0 { + col-gpios + = <&pro_micro_a 1 GPIO_ACTIVE_HIGH> + , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 10 GPIO_ACTIVE_HIGH> + ; +}; + +&bt_unpair_combo { + key-positions = <11 43>; +}; From f6a9c1ee57e9e8b5a6d2fd7cd5a60c32138a4404 Mon Sep 17 00:00:00 2001 From: Okke Formsma Date: Wed, 2 Sep 2020 15:10:46 +0200 Subject: [PATCH 21/25] rename tests --- .../balanced/{1 => 1-dn-up}/events.patterns | 0 .../{1 => 1-dn-up}/keycode_events.snapshot | 0 .../{1 => 1-dn-up}/native_posix.keymap | 0 .../{2 => 2-dn-timer-up}/events.patterns | 0 .../keycode_events.snapshot | 0 .../{2 => 2-dn-timer-up}/native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../{1 => 1-dn-up}/events.patterns | 0 .../{1 => 1-dn-up}/keycode_events.snapshot | 0 .../{1 => 1-dn-up}/native_posix.keymap | 0 .../{2 => 2-dn-timer-up}/events.patterns | 0 .../keycode_events.snapshot | 0 .../{2 => 2-dn-timer-up}/native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../{1 => 1-dn-up}/events.patterns | 0 .../{1 => 1-dn-up}/keycode_events.snapshot | 0 .../{1 => 1-dn-up}/native_posix.keymap | 0 .../{2 => 2-dn-timer-up}/events.patterns | 0 .../keycode_events.snapshot | 0 .../{2 => 2-dn-timer-up}/native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../events.patterns | 0 .../keycode_events.snapshot | 0 .../native_posix.keymap | 0 .../tap-hold/balanced/behavior_keymap.dtsi | 27 ----------------- .../hold-preferred/behavior_keymap.dtsi | 29 ------------------- .../tap-preferred/behavior_keymap.dtsi | 27 ----------------- 102 files changed, 83 deletions(-) rename app/tests/hold-tap/balanced/{1 => 1-dn-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{1 => 1-dn-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{1 => 1-dn-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{2 => 2-dn-timer-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{2 => 2-dn-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{2 => 2-dn-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{3a => 3a-moddn-dn-modup-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{3a => 3a-moddn-dn-modup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{3a => 3a-moddn-dn-modup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{3b => 3b-moddn-dn-modup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{3b => 3b-moddn-dn-modup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{3b => 3b-moddn-dn-modup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{3c => 3c-kcdn-dn-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{3c => 3c-kcdn-dn-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{3c => 3c-kcdn-dn-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{3d => 3d-kcdn-dn-kcup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{3d => 3d-kcdn-dn-kcup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{3d => 3d-kcdn-dn-kcup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{4a-nested => 4a-dn-htdn-timer-htup-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{4a-nested => 4a-dn-htdn-timer-htup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{4a-nested => 4a-dn-htdn-timer-htup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{4a => 4a-dn-kcdn-timer-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{4a => 4a-dn-kcdn-timer-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{4a => 4a-dn-kcdn-timer-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{4b => 4b-dn-kcdn-kcup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{4b => 4b-dn-kcdn-kcup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{4b => 4b-dn-kcdn-kcup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{4c => 4c-dn-kcdn-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/balanced/{4c => 4c-dn-kcdn-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{4c => 4c-dn-kcdn-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/balanced/{4d => 4d-dn-kcdn-timer-up-kcup}/events.patterns (100%) rename app/tests/hold-tap/balanced/{4d => 4d-dn-kcdn-timer-up-kcup}/keycode_events.snapshot (100%) rename app/tests/hold-tap/balanced/{4d => 4d-dn-kcdn-timer-up-kcup}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{1 => 1-dn-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{1 => 1-dn-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{1 => 1-dn-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{2 => 2-dn-timer-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{2 => 2-dn-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{2 => 2-dn-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{3a => 3a-moddn-dn-modup-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{3a => 3a-moddn-dn-modup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{3a => 3a-moddn-dn-modup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{3b => 3b-moddn-dn-modup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{3b => 3b-moddn-dn-modup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{3b => 3b-moddn-dn-modup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{3c => 3c-kcdn-dn-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{3c => 3c-kcdn-dn-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{3c => 3c-kcdn-dn-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{3d => 3d-kcdn-dn-kcup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{3d => 3d-kcdn-dn-kcup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{3d => 3d-kcdn-dn-kcup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{4a-nested => 4a-dn-htdn-timer-htup-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{4a-nested => 4a-dn-htdn-timer-htup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{4a-nested => 4a-dn-htdn-timer-htup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{4a => 4a-dn-kcdn-timer-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{4a => 4a-dn-kcdn-timer-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{4a => 4a-dn-kcdn-timer-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{4b => 4b-dn-kcdn-kcup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{4b => 4b-dn-kcdn-kcup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{4b => 4b-dn-kcdn-kcup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{4c => 4c-dn-kcdn-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{4c => 4c-dn-kcdn-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{4c => 4c-dn-kcdn-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/hold-preferred/{4d => 4d-dn-kcdn-timer-up-kcup}/events.patterns (100%) rename app/tests/hold-tap/hold-preferred/{4d => 4d-dn-kcdn-timer-up-kcup}/keycode_events.snapshot (100%) rename app/tests/hold-tap/hold-preferred/{4d => 4d-dn-kcdn-timer-up-kcup}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{1 => 1-dn-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{1 => 1-dn-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{1 => 1-dn-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{2 => 2-dn-timer-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{2 => 2-dn-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{2 => 2-dn-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{3a => 3a-moddn-dn-modup-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{3a => 3a-moddn-dn-modup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{3a => 3a-moddn-dn-modup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{3b => 3b-moddn-dn-modup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{3b => 3b-moddn-dn-modup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{3b => 3b-moddn-dn-modup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{3c => 3c-kcdn-dn-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{3c => 3c-kcdn-dn-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{3c => 3c-kcdn-dn-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{3d => 3d-kcdn-dn-kcup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{3d => 3d-kcdn-dn-kcup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{3d => 3d-kcdn-dn-kcup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{4a-nested => 4a-dn-htdn-timer-htup-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{4a-nested => 4a-dn-htdn-timer-htup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{4a-nested => 4a-dn-htdn-timer-htup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{4a => 4a-dn-kcdn-timer-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{4a => 4a-dn-kcdn-timer-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{4a => 4a-dn-kcdn-timer-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{4b => 4b-dn-kcdn-kcup-timer-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{4b => 4b-dn-kcdn-kcup-timer-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{4b => 4b-dn-kcdn-kcup-timer-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{4c => 4c-dn-kcdn-kcup-up}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{4c => 4c-dn-kcdn-kcup-up}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{4c => 4c-dn-kcdn-kcup-up}/native_posix.keymap (100%) rename app/tests/hold-tap/tap-preferred/{4d => 4d-dn-kcdn-timer-up-kcup}/events.patterns (100%) rename app/tests/hold-tap/tap-preferred/{4d => 4d-dn-kcdn-timer-up-kcup}/keycode_events.snapshot (100%) rename app/tests/hold-tap/tap-preferred/{4d => 4d-dn-kcdn-timer-up-kcup}/native_posix.keymap (100%) delete mode 100644 app/tests/tap-hold/balanced/behavior_keymap.dtsi delete mode 100644 app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi delete mode 100644 app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi diff --git a/app/tests/hold-tap/balanced/1/events.patterns b/app/tests/hold-tap/balanced/1-dn-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/1/events.patterns rename to app/tests/hold-tap/balanced/1-dn-up/events.patterns diff --git a/app/tests/hold-tap/balanced/1/keycode_events.snapshot b/app/tests/hold-tap/balanced/1-dn-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/1/keycode_events.snapshot rename to app/tests/hold-tap/balanced/1-dn-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/1/native_posix.keymap b/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/1/native_posix.keymap rename to app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/2/events.patterns b/app/tests/hold-tap/balanced/2-dn-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/2/events.patterns rename to app/tests/hold-tap/balanced/2-dn-timer-up/events.patterns diff --git a/app/tests/hold-tap/balanced/2/keycode_events.snapshot b/app/tests/hold-tap/balanced/2-dn-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/2/keycode_events.snapshot rename to app/tests/hold-tap/balanced/2-dn-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/2/native_posix.keymap b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/2/native_posix.keymap rename to app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/3a/events.patterns b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/3a/events.patterns rename to app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/events.patterns diff --git a/app/tests/hold-tap/balanced/3a/keycode_events.snapshot b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/3a/keycode_events.snapshot rename to app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/3a/native_posix.keymap b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/3a/native_posix.keymap rename to app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/3b/events.patterns b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/3b/events.patterns rename to app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/events.patterns diff --git a/app/tests/hold-tap/balanced/3b/keycode_events.snapshot b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/3b/keycode_events.snapshot rename to app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/3b/native_posix.keymap b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/3b/native_posix.keymap rename to app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/3c/events.patterns b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/3c/events.patterns rename to app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/events.patterns diff --git a/app/tests/hold-tap/balanced/3c/keycode_events.snapshot b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/3c/keycode_events.snapshot rename to app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/3c/native_posix.keymap b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/3c/native_posix.keymap rename to app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/3d/events.patterns b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/3d/events.patterns rename to app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/events.patterns diff --git a/app/tests/hold-tap/balanced/3d/keycode_events.snapshot b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/3d/keycode_events.snapshot rename to app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/3d/native_posix.keymap b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/3d/native_posix.keymap rename to app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/4a-nested/events.patterns b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/4a-nested/events.patterns rename to app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/events.patterns diff --git a/app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot rename to app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/4a-nested/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/4a-nested/native_posix.keymap rename to app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/4a/events.patterns b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/4a/events.patterns rename to app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/events.patterns diff --git a/app/tests/hold-tap/balanced/4a/keycode_events.snapshot b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/4a/keycode_events.snapshot rename to app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/4a/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/4a/native_posix.keymap rename to app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/4b/events.patterns b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/4b/events.patterns rename to app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/events.patterns diff --git a/app/tests/hold-tap/balanced/4b/keycode_events.snapshot b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/4b/keycode_events.snapshot rename to app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/4b/native_posix.keymap b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/4b/native_posix.keymap rename to app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/4c/events.patterns b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/4c/events.patterns rename to app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/events.patterns diff --git a/app/tests/hold-tap/balanced/4c/keycode_events.snapshot b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/4c/keycode_events.snapshot rename to app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/4c/native_posix.keymap b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/4c/native_posix.keymap rename to app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/balanced/4d/events.patterns b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/events.patterns similarity index 100% rename from app/tests/hold-tap/balanced/4d/events.patterns rename to app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/events.patterns diff --git a/app/tests/hold-tap/balanced/4d/keycode_events.snapshot b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/balanced/4d/keycode_events.snapshot rename to app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot diff --git a/app/tests/hold-tap/balanced/4d/native_posix.keymap b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/balanced/4d/native_posix.keymap rename to app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/1/events.patterns b/app/tests/hold-tap/hold-preferred/1-dn-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/1/events.patterns rename to app/tests/hold-tap/hold-preferred/1-dn-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/1-dn-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/1-dn-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/1/native_posix.keymap b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/1/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/2/events.patterns b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/2/events.patterns rename to app/tests/hold-tap/hold-preferred/2-dn-timer-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/2-dn-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/2/native_posix.keymap b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/2/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/3a/events.patterns b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/3a/events.patterns rename to app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/3a/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/3a/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/3b/events.patterns b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/3b/events.patterns rename to app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/3b/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/3b/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/3c/events.patterns b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/3c/events.patterns rename to app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/3c/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/3c/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/3d/events.patterns b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/3d/events.patterns rename to app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/3d/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/3d/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/events.patterns b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/4a-nested/events.patterns rename to app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/4a/events.patterns b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/4a/events.patterns rename to app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/4a/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/4a/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/4b/events.patterns b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/4b/events.patterns rename to app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/4b/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/4b/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/4c/events.patterns b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/4c/events.patterns rename to app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/4c/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/4c/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/hold-preferred/4d/events.patterns b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns similarity index 100% rename from app/tests/hold-tap/hold-preferred/4d/events.patterns rename to app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns diff --git a/app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot rename to app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot diff --git a/app/tests/hold-tap/hold-preferred/4d/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/hold-preferred/4d/native_posix.keymap rename to app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/1/events.patterns b/app/tests/hold-tap/tap-preferred/1-dn-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/1/events.patterns rename to app/tests/hold-tap/tap-preferred/1-dn-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/1-dn-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/1-dn-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/1/native_posix.keymap b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/1/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/2/events.patterns b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/2/events.patterns rename to app/tests/hold-tap/tap-preferred/2-dn-timer-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/2-dn-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/2/native_posix.keymap b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/2/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/3a/events.patterns b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/3a/events.patterns rename to app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/3a/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/3a/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/3b/events.patterns b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/3b/events.patterns rename to app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/3b/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/3b/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/3c/events.patterns b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/3c/events.patterns rename to app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/3c/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/3c/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/3d/events.patterns b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/3d/events.patterns rename to app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/3d/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/3d/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/events.patterns b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/4a-nested/events.patterns rename to app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/4a/events.patterns b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/4a/events.patterns rename to app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/4a/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/4a/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/4b/events.patterns b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/4b/events.patterns rename to app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/4b/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/4b/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/4c/events.patterns b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/4c/events.patterns rename to app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/4c/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/4c/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap diff --git a/app/tests/hold-tap/tap-preferred/4d/events.patterns b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns similarity index 100% rename from app/tests/hold-tap/tap-preferred/4d/events.patterns rename to app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns diff --git a/app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot similarity index 100% rename from app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot rename to app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot diff --git a/app/tests/hold-tap/tap-preferred/4d/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap similarity index 100% rename from app/tests/hold-tap/tap-preferred/4d/native_posix.keymap rename to app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap diff --git a/app/tests/tap-hold/balanced/behavior_keymap.dtsi b/app/tests/tap-hold/balanced/behavior_keymap.dtsi deleted file mode 100644 index df56fb5b..00000000 --- a/app/tests/tap-hold/balanced/behavior_keymap.dtsi +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include -#include - -/ { - behaviors { - ht_bal: behavior_hold_tap_balanced { - compatible = "zmk,behavior-hold-tap"; - label = "HOLD_TAP_BALANCED"; - #binding-cells = <2>; - flavor = "balanced"; - tapping_term_ms = <300>; - bindings = <&kp>, <&kp>; - }; - }; - - keymap { - compatible = "zmk,keymap"; - label ="Default keymap"; - - default_layer { - bindings = < - &ht_bal LSFT F &ht_bal LCTL J - &kp D &kp RCTL>; - }; - }; -}; diff --git a/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi b/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi deleted file mode 100644 index 375ffd93..00000000 --- a/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include - - - -/ { - behaviors { - ht_hold: behavior_hold_hold_tap { - compatible = "zmk,behavior-hold-tap"; - label = "hold_hold_tap"; - #binding-cells = <2>; - flavor = "hold-preferred"; - tapping_term_ms = <300>; - bindings = <&kp>, <&kp>; - }; - }; - - keymap { - compatible = "zmk,keymap"; - label ="Default keymap"; - - default_layer { - bindings = < - &ht_hold LSFT F &ht_hold LCTL J - &kp D &kp RCTL>; - }; - }; -}; diff --git a/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi b/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi deleted file mode 100644 index e514fa65..00000000 --- a/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include -#include - -/ { - behaviors { - tp: behavior_tap_preferred { - compatible = "zmk,behavior-hold-tap"; - label = "MOD_TAP"; - #binding-cells = <2>; - flavor = "tap-preferred"; - tapping_term_ms = <300>; - bindings = <&kp>, <&kp>; - }; - }; - - keymap { - compatible = "zmk,keymap"; - label ="Default keymap"; - - default_layer { - bindings = < - &tp LSFT F &tp LCTL J - &kp D &kp RCTL>; - }; - }; -}; From c5ca66441172114b57ca7f7b27d13d0d342d4fcc Mon Sep 17 00:00:00 2001 From: Okke Formsma Date: Wed, 2 Sep 2020 15:11:56 +0200 Subject: [PATCH 22/25] some fixes based on feedback --- app/dts/behaviors/homerow_tap.dtsi | 2 +- ...p-hold.yaml => zmk,behavior-hold-tap.yaml} | 0 app/include/zmk/event-manager.h | 9 ++-- app/run-test-debug.sh | 44 ------------------- app/src/behaviors/behavior_hold_tap.c | 30 ++++++------- app/src/event_manager.c | 22 +++++++--- app/tests/hold-tap/README.md | 1 + docs/docs/behavior/mod-tap.md | 2 +- 8 files changed, 38 insertions(+), 72 deletions(-) rename app/dts/bindings/behaviors/{zmk,behavior-tap-hold.yaml => zmk,behavior-hold-tap.yaml} (100%) delete mode 100755 app/run-test-debug.sh create mode 100644 app/tests/hold-tap/README.md diff --git a/app/dts/behaviors/homerow_tap.dtsi b/app/dts/behaviors/homerow_tap.dtsi index 21c1531f..4162c288 100644 --- a/app/dts/behaviors/homerow_tap.dtsi +++ b/app/dts/behaviors/homerow_tap.dtsi @@ -2,7 +2,7 @@ behaviors { ht: behavior_homerow_mod { compatible = "zmk,behavior-hold-tap"; - label = "homerow_mod"; + label = "HOMEROW_MOD"; #binding-cells = <2>; flavor = "balanced"; tapping_term_ms = <200>; diff --git a/app/dts/bindings/behaviors/zmk,behavior-tap-hold.yaml b/app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml similarity index 100% rename from app/dts/bindings/behaviors/zmk,behavior-tap-hold.yaml rename to app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event-manager.h index 07c0aa98..d9a56a4f 100644 --- a/app/include/zmk/event-manager.h +++ b/app/include/zmk/event-manager.h @@ -75,13 +75,14 @@ struct zmk_event_subscription { #define ZMK_EVENT_RAISE_AFTER(ev, mod) \ zmk_event_manager_raise_after((struct zmk_event_header *)ev, &zmk_listener_##mod); + +#define ZMK_EVENT_RAISE_AT(ev, mod) \ + zmk_event_manager_raise_at((struct zmk_event_header *)ev, &zmk_listener_##mod); + #define ZMK_EVENT_RELEASE(ev) \ zmk_event_manager_release((struct zmk_event_header *)ev); -#define ZMK_EVENT_RELEASE_AGAIN(ev) \ - zmk_event_manager_release_again((struct zmk_event_header *)ev); - int zmk_event_manager_raise(struct zmk_event_header *event); int zmk_event_manager_raise_after(struct zmk_event_header *event, const struct zmk_listener *listener); +int zmk_event_manager_raise_at(struct zmk_event_header *event, const struct zmk_listener *listener); int zmk_event_manager_release(struct zmk_event_header *event); -int zmk_event_manager_release_again(struct zmk_event_header *event); diff --git a/app/run-test-debug.sh b/app/run-test-debug.sh deleted file mode 100755 index f6696a1d..00000000 --- a/app/run-test-debug.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2020 Peter Johanson; Cody McGinnis; Okke Formsma -# -# SPDX-License-Identifier: MIT -# -set -e -set -x - -if [ -z "$1" ]; then - echo "Usage: ./run-test.sh " - exit 1 -elif [ "$1" = "all" ]; then - echo "" > ./build/tests/pass-fail.log - find tests -name native_posix.keymap -exec dirname \{\} \; | xargs -l -P 4 ./run-test.sh - err=$? - sort -k2 ./build/tests/pass-fail.log - exit $err -fi - -testcase="$1" -echo "Running $testcase:" - -west build -d build/$testcase -b native_posix --pristine -- -DZMK_CONFIG=$testcase -if [ $? -gt 0 ]; then - echo "FAIL: $testcase did not build" -else - ./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | tee build/$testcase/keycode_events_full.log | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log - cat build/$testcase/keycode_events_full.log - cat build/$testcase/keycode_events.log - diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log - if [ $? -gt 0 ]; then - if [ -f $testcase/pending ]; then - echo "PEND: $testcase" - exit 0 - else - echo "FAIL: $testcase" - exit 1 - fi - else - echo "PASS: $testcase" - exit 0 - fi -fi \ No newline at end of file diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c index 08fa1397..cd788f75 100644 --- a/app/src/behaviors/behavior_hold_tap.c +++ b/app/src/behaviors/behavior_hold_tap.c @@ -23,7 +23,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #if DT_NODE_EXISTS(DT_DRV_INST(0)) -/************************************************************ DATA SETUP */ #define ZMK_BHV_HOLD_TAP_MAX_HELD 10 #define ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS 40 @@ -40,7 +39,7 @@ typedef k_timeout_t (*timer_func)(); struct behavior_hold_tap_config { timer_func tapping_term_ms; struct behavior_hold_tap_behaviors *behaviors; - char *flavor; + int flavor; }; // this data is specific for each hold-tap @@ -65,7 +64,6 @@ struct active_hold_tap active_hold_taps[ZMK_BHV_HOLD_TAP_MAX_HELD] = {}; // We capture most position_state_changed events and some modifiers_state_changed events. const struct zmk_event_header *captured_events[ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS] = {}; -/************************************************************ CAPTURED POSITION HELPER FUNCTIONS */ static int capture_event(const struct zmk_event_header *event) { for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) { @@ -96,6 +94,8 @@ static struct position_state_changed *find_captured_keydown_event(u32_t position return last_match; } +const struct zmk_listener zmk_listener_behavior_hold_tap; + static void release_captured_events() { if (undecided_hold_tap != NULL) { @@ -143,13 +143,10 @@ static void release_captured_events() struct keycode_state_changed *modifier_event = cast_keycode_state_changed(captured_event); LOG_DBG("Releasing mods changed event 0x%02X %s", modifier_event->keycode, (modifier_event->state ? "pressed" : "released")); } - ZMK_EVENT_RELEASE_AGAIN(captured_event); + ZMK_EVENT_RAISE_AT(captured_event, behavior_hold_tap); } } - -/************************************************************ ACTIVE TAP HOLD HELPER FUNCTIONS */ - static struct active_hold_tap *find_hold_tap(u32_t position) { for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_HELD; i++) { @@ -256,12 +253,12 @@ static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_mome return; } - char *flavor = hold_tap->config->flavor; - if (strcmp(flavor, "balanced") == 0) { + int flavor = hold_tap->config->flavor; + if (flavor == 1) { decide_balanced(hold_tap, event); - } else if (strcmp(flavor, "tap-preferred") == 0) { + } else if (flavor == 2) { decide_tap_preferred(hold_tap, event); - } else if (strcmp(flavor, "hold-preferred") == 0) { + } else if (flavor == 0) { decide_hold_preferred(hold_tap, event); } @@ -269,7 +266,11 @@ static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_mome return; } - LOG_DBG("%d decided %s (%s event %d)", hold_tap->position, hold_tap->is_hold ? "hold" : "tap", flavor, event); + LOG_DBG("%d decided %s (%s event %d)", + hold_tap->position, + hold_tap->is_hold ? "hold" : "tap", + flavor == 0 ? "hold-preferred" : flavor == 1 ? "balanced": "tap-preferred", + event); undecided_hold_tap = NULL; struct zmk_behavior_binding *behavior; @@ -285,7 +286,6 @@ static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_mome release_captured_events(); } -/************************************************************ hold_tap_binding and key handlers */ static int on_hold_tap_binding_pressed(struct device *dev, u32_t position, u32_t param_hold, u32_t param_tap) { const struct behavior_hold_tap_config *cfg = dev->config_info; @@ -430,7 +430,6 @@ ZMK_SUBSCRIPTION(behavior_hold_tap, position_state_changed); // this should be modifiers_state_changed, but unfrotunately that's not implemented yet. ZMK_SUBSCRIPTION(behavior_hold_tap, keycode_state_changed); -/************************************************************ TIMER FUNCTIONS */ void behavior_hold_tap_timer_work_handler(struct k_work *item) { struct active_hold_tap *hold_tap = CONTAINER_OF(item, struct active_hold_tap, work); @@ -459,7 +458,6 @@ static int behavior_hold_tap_init(struct device *dev) struct behavior_hold_tap_data {}; static struct behavior_hold_tap_data behavior_hold_tap_data; -/************************************************************ NODE CONFIG */ #define _TRANSFORM_ENTRY(idx, node) \ { \ .behavior_dev = DT_LABEL(DT_INST_PHANDLE_BY_IDX(node, bindings, idx)), \ @@ -476,7 +474,7 @@ static struct behavior_hold_tap_data behavior_hold_tap_data; static struct behavior_hold_tap_config behavior_hold_tap_config_##n = { \ .behaviors = &behavior_hold_tap_behaviors_##n, \ .tapping_term_ms = &behavior_hold_tap_config_##n##_gettime, \ - .flavor = DT_INST_PROP(n, flavor), \ + .flavor = DT_ENUM_IDX(DT_DRV_INST(n), flavor), \ }; \ DEVICE_AND_API_INIT( \ behavior_hold_tap_##n, DT_INST_LABEL(n), behavior_hold_tap_init, \ diff --git a/app/src/event_manager.c b/app/src/event_manager.c index 2f423fc5..47ad6b73 100644 --- a/app/src/event_manager.c +++ b/app/src/event_manager.c @@ -71,13 +71,23 @@ int zmk_event_manager_raise_after(struct zmk_event_header *event, const struct z return -EINVAL; } -int zmk_event_manager_release(struct zmk_event_header *event) +int zmk_event_manager_raise_at(struct zmk_event_header *event, const struct zmk_listener *listener) { - return zmk_event_manager_handle_from(event, event->last_listener_index + 1); -} + u8_t len = __event_subscriptions_end - __event_subscriptions_start; + for (int i = 0; i < len; i++) { + struct zmk_event_subscription *ev_sub = __event_subscriptions_start + i; + + if (ev_sub->event_type == event->event && ev_sub->listener == listener) { + return zmk_event_manager_handle_from(event, i); + } + } + LOG_WRN("Unable to find where to raise this event"); + + return -EINVAL; +} -int zmk_event_manager_release_again(struct zmk_event_header *event) +int zmk_event_manager_release(struct zmk_event_header *event) { - return zmk_event_manager_handle_from(event, event->last_listener_index); -} \ No newline at end of file + return zmk_event_manager_handle_from(event, event->last_listener_index + 1); +} diff --git a/app/tests/hold-tap/README.md b/app/tests/hold-tap/README.md new file mode 100644 index 00000000..0630132d --- /dev/null +++ b/app/tests/hold-tap/README.md @@ -0,0 +1 @@ +Refer to the pdf/open document "zmk-modtap-proposal.{pdf,odt}" in this directory for a visual representation of the numbered tests for hold-tap. diff --git a/docs/docs/behavior/mod-tap.md b/docs/docs/behavior/mod-tap.md index cbe95e42..dcac4920 100644 --- a/docs/docs/behavior/mod-tap.md +++ b/docs/docs/behavior/mod-tap.md @@ -22,7 +22,7 @@ The Mod-Tap behavior either acts as a held modifier, or as a tapped keycode. Example: ``` -&mt MOD_LSFT A +&mt LSFT A ``` ### Configuration From c2ffeb1cf4a27b79c9fcc7cf0c83deab3cd4b84e Mon Sep 17 00:00:00 2001 From: Kurtis Lew Date: Wed, 2 Sep 2020 07:21:45 -0700 Subject: [PATCH 23/25] Added Copyright Header to Kconfig.defconfig --- app/boards/shields/iris/Kconfig.defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/boards/shields/iris/Kconfig.defconfig b/app/boards/shields/iris/Kconfig.defconfig index bf4919ac..6439780c 100644 --- a/app/boards/shields/iris/Kconfig.defconfig +++ b/app/boards/shields/iris/Kconfig.defconfig @@ -1,3 +1,5 @@ +# Copyright (c) 2020 Pete Johanson, Kurtis Lew +# SPDX-License-Identifier: MIT if SHIELD_IRIS_LEFT @@ -11,4 +13,4 @@ if SHIELD_IRIS_RIGHT config ZMK_KEYBOARD_NAME default "Iris Right" -endif \ No newline at end of file +endif From 6e8f19028a58d5238aa75b3fef3551e2cedaebdc Mon Sep 17 00:00:00 2001 From: Kurtis Lew Date: Wed, 2 Sep 2020 07:22:39 -0700 Subject: [PATCH 24/25] Added copyright header to iris.keymap --- app/boards/shields/iris/iris.keymap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/boards/shields/iris/iris.keymap b/app/boards/shields/iris/iris.keymap index 4607adf0..46b0817f 100644 --- a/app/boards/shields/iris/iris.keymap +++ b/app/boards/shields/iris/iris.keymap @@ -1,3 +1,6 @@ +# Copyright (c) 2020 Pete Johanson, Kurtis Lew +# SPDX-License-Identifier: MIT + #include #include From c9a82d71d06146dfe706a2e8d223dab593dffffc Mon Sep 17 00:00:00 2001 From: Okke Formsma Date: Wed, 2 Sep 2020 16:41:39 +0200 Subject: [PATCH 25/25] fixes for feedback round 2 --- app/dts/behaviors.dtsi | 1 - app/dts/behaviors/homerow_tap.dtsi | 12 --------- app/src/behaviors/behavior_hold_tap.c | 39 ++++++++++++++++++--------- docs/docs/behavior/hold-tap.md | 4 +-- 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 app/dts/behaviors/homerow_tap.dtsi diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi index fdcf426b..ab70bcc7 100644 --- a/app/dts/behaviors.dtsi +++ b/app/dts/behaviors.dtsi @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include diff --git a/app/dts/behaviors/homerow_tap.dtsi b/app/dts/behaviors/homerow_tap.dtsi deleted file mode 100644 index 4162c288..00000000 --- a/app/dts/behaviors/homerow_tap.dtsi +++ /dev/null @@ -1,12 +0,0 @@ -/ { - behaviors { - ht: behavior_homerow_mod { - compatible = "zmk,behavior-hold-tap"; - label = "HOMEROW_MOD"; - #binding-cells = <2>; - flavor = "balanced"; - tapping_term_ms = <200>; - bindings = <&kp>, <&kp>; - }; - }; -}; diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c index cd788f75..2c6d996e 100644 --- a/app/src/behaviors/behavior_hold_tap.c +++ b/app/src/behaviors/behavior_hold_tap.c @@ -29,6 +29,13 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); // increase if you have keyboard with more keys. #define ZMK_BHV_HOLD_TAP_POSITION_NOT_USED 9999 + +enum flavor { + ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED = 0, + ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED = 1, + ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED = 2, +}; + struct behavior_hold_tap_behaviors { struct zmk_behavior_binding tap; struct zmk_behavior_binding hold; @@ -39,7 +46,7 @@ typedef k_timeout_t (*timer_func)(); struct behavior_hold_tap_config { timer_func tapping_term_ms; struct behavior_hold_tap_behaviors *behaviors; - int flavor; + enum flavor flavor; }; // this data is specific for each hold-tap @@ -197,9 +204,6 @@ static void decide_balanced(struct active_hold_tap *hold_tap, enum decision_mome hold_tap->is_decided = true; break; case HT_OTHER_KEY_UP: - hold_tap->is_hold = 1; - hold_tap->is_decided = true; - break; case HT_TIMER_EVENT: hold_tap->is_hold = 1; hold_tap->is_decided = true; @@ -231,9 +235,6 @@ static void decide_hold_preferred(struct active_hold_tap *hold_tap, enum decisio hold_tap->is_decided = true; break; case HT_OTHER_KEY_DOWN: - hold_tap->is_hold = 1; - hold_tap->is_decided = true; - break; case HT_TIMER_EVENT: hold_tap->is_hold = 1; hold_tap->is_decided = true; @@ -242,6 +243,18 @@ static void decide_hold_preferred(struct active_hold_tap *hold_tap, enum decisio } } +static inline char* flavor_str(enum flavor flavor) { + switch(flavor) { + case ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED: + return "hold-preferred"; + case ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED: + return "balanced"; + case ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED: + return "tap-preferred"; + } + return "UNKNOWN FLAVOR"; +} + static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_moment event) { if (hold_tap->is_decided) { @@ -253,13 +266,13 @@ static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_mome return; } - int flavor = hold_tap->config->flavor; - if (flavor == 1) { + switch(hold_tap->config->flavor) { + case ZMK_BHV_HOLD_TAP_FLAVOR_HOLD_PREFERRED: + decide_hold_preferred(hold_tap, event); + case ZMK_BHV_HOLD_TAP_FLAVOR_BALANCED: decide_balanced(hold_tap, event); - } else if (flavor == 2) { + case ZMK_BHV_HOLD_TAP_FLAVOR_TAP_PREFERRED: decide_tap_preferred(hold_tap, event); - } else if (flavor == 0) { - decide_hold_preferred(hold_tap, event); } if (!hold_tap->is_decided) { @@ -269,7 +282,7 @@ static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_mome LOG_DBG("%d decided %s (%s event %d)", hold_tap->position, hold_tap->is_hold ? "hold" : "tap", - flavor == 0 ? "hold-preferred" : flavor == 1 ? "balanced": "tap-preferred", + flavor_str(hold_tap->config->flavor), event); undecided_hold_tap = NULL; diff --git a/docs/docs/behavior/hold-tap.md b/docs/docs/behavior/hold-tap.md index b586b90e..fa68538b 100644 --- a/docs/docs/behavior/hold-tap.md +++ b/docs/docs/behavior/hold-tap.md @@ -31,9 +31,9 @@ A code example which configures a mod-tap setting that works with homerow mods: / { behaviors { - &hm: homerow_mods { + hm: homerow_mods { compatible = "zmk,behavior-hold-tap"; - label = "homerow_mods"; + label = "HOMEROW_MODS"; #binding-cells = <2>; tapping_term_ms = <175>; flavor = "balanced";