From 4dee66663014c5a3847d479b1278e27bbe57bfba Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Tue, 27 Dec 2022 15:53:08 +0100 Subject: [PATCH 1/7] add combo test, increase space-alt hold time --- .../boards/shields/leko_pona/leko_pona.keymap | 38 +++++++++++-------- config/leko_pona.conf | 2 + 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index 9994de1..28a18e3 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -25,7 +25,6 @@ ZMK_UNICODE_PAIR(win_euro, N2, N0, A, C, N0, N0, B, N0) // euro sign and degree ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o - #define BASE 0 #define SYM 1 #define NAV 2 @@ -47,9 +46,17 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o then-layer = ; }; }; -}; -/ { + combos { + compatible = "zmk,combos"; + combo_toki_a { + key-positions = <5>; + bindings = <¯o_tap &kp SPACE &kp T &kp O &kp K &kp I>; + slow-release = true; + layers = ; + }; + }; + behaviors { esctab: shift_esc_tab { compatible = "zmk,behavior-mod-morph"; @@ -72,15 +79,13 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o label = "GLOBAL_QUICK_TAP"; #binding-cells = <2>; flavor = "tap-preferred"; - tapping-term-ms = <200>; - quick-tap-ms = <125>; + tapping-term-ms = <400>; + quick-tap-ms = <250>; global-quick-tap; bindings = <&kp>, <&kp>; }; }; -}; -/ { keymap { compatible = "zmk,keymap"; l_base { @@ -103,10 +108,10 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o // F keys + navigation l_nav { bindings = < -&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp PG_UP &kp HOME &kp UP &kp END &kp PSCRN -&kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &kp K_CMENU -&trans &kp F11 &kp F12 &kp F13 &kp F14 &kp F15 &kp F16 &kp F17 &kp F18 &trans - &trans &trans &trans &trans &trans &trans +&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp PG_UP &kp HOME &kp UP &kp END &kp PSCRN +&kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &kp K_CMENU +&trans &kp F11 &kp F12 &kp F13 &kp F14 &kp F15 &kp F16 &kp F17 &kp F18 &trans + &trans &trans &trans &trans &trans &trans >; }; // media + bluetooth + layer toggles + numpad @@ -118,13 +123,13 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o &trans &trans &trans &trans &trans &kp KP_ENTER >; }; - // toki pona + // toki pona steno l_toki { bindings = < -&trans &kp P &kp W &kp U &none &tog TOKI &kp E &kp S &kp J &trans -&kp N &kp L &kp I &kp A &none &none &kp O &kp T &kp M &kp K -&trans &none &kp QMARK &kp EXCL &none &none &kp DOT &kp COMMA &none &none - &trans &none &trans &none &trans &trans +&trans &none &none &none &none &tog TOKI &none &none &none &none +&kp A &kp A &kp A &kp A &none &none &kp A &kp A &kp A &kp A +&trans &none &none &none &none &none &none &none &none &trans + &kp SPACE &trans &trans &none &none &trans >; }; // game compatibility / half qwerty @@ -145,6 +150,7 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o &trans &trans &trans &trans &trans &trans >; }; + // unicode macros for symbol layer in windows mode l_win_unicode { bindings = < &trans &trans &trans &trans &win_euro &win_multi_o &win_ao &win_ae &win_oe &trans diff --git a/config/leko_pona.conf b/config/leko_pona.conf index 6b4a087..67bb12b 100644 --- a/config/leko_pona.conf +++ b/config/leko_pona.conf @@ -1 +1,3 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=8 +CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=2 From bc09905f173d634d96b5cb415d11f45b5b461de8 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Tue, 27 Dec 2022 16:02:59 +0100 Subject: [PATCH 2/7] fix slow release --- config/boards/shields/leko_pona/leko_pona.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index 28a18e3..9b82b35 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -52,7 +52,7 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o combo_toki_a { key-positions = <5>; bindings = <¯o_tap &kp SPACE &kp T &kp O &kp K &kp I>; - slow-release = true; + slow-release; layers = ; }; }; From ec738b5652862b207ad394d6ce8650e88f16c668 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Tue, 27 Dec 2022 16:23:35 +0100 Subject: [PATCH 3/7] test --- config/boards/shields/leko_pona/leko_pona.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index 9b82b35..90cf0cb 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -50,9 +50,9 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o combos { compatible = "zmk,combos"; combo_toki_a { - key-positions = <5>; + key-positions = <5 6>; bindings = <¯o_tap &kp SPACE &kp T &kp O &kp K &kp I>; - slow-release; + // slow-release; layers = ; }; }; From c1cde0223e3dd15b72e252955bd2f2201fa8e4bb Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Tue, 27 Dec 2022 16:35:03 +0100 Subject: [PATCH 4/7] use macro for word test --- config/boards/shields/leko_pona/leko_pona.keymap | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index 90cf0cb..5d0d988 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -47,11 +47,23 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o }; }; + macros { + word_test: word_test { + label = "Word_test"; + compatible = "zmk,behavior-macro"; + #binding-cells = <0>; + wait-ms = <5>; + tap-ms = <5>; + bindings = <¯o_tap &kp T &kp O &kp K &kp I> + ; + }; + }; + combos { compatible = "zmk,combos"; combo_toki_a { key-positions = <5 6>; - bindings = <¯o_tap &kp SPACE &kp T &kp O &kp K &kp I>; + bindings = <&word_test>; // slow-release; layers = ; }; From 0a44805f3a3ec88e58642fb7d8110b8bcc8eb821 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Tue, 27 Dec 2022 22:47:39 +0100 Subject: [PATCH 5/7] test --- config/boards/shields/leko_pona/leko_pona.keymap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index 5d0d988..3a82b8b 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -54,16 +54,16 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o #binding-cells = <0>; wait-ms = <5>; tap-ms = <5>; - bindings = <¯o_tap &kp T &kp O &kp K &kp I> - ; + bindings = <¯o_tap &kp T &kp O &kp K &kp I>; }; }; + // home row key positions are 10 11 12 13 -- 16 17 18 19 combos { compatible = "zmk,combos"; combo_toki_a { - key-positions = <5 6>; - bindings = <&word_test>; + key-positions = <10 11>; + bindings = <¯o_tap &kp T &kp O &kp K &kp I>; // slow-release; layers = ; }; From 30f9fef8ff3e669ef627c4c234ba1ae140a521f6 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Tue, 27 Dec 2022 23:22:48 +0100 Subject: [PATCH 6/7] test slow release --- config/boards/shields/leko_pona/leko_pona.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index 3a82b8b..b7fe966 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -63,8 +63,8 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o compatible = "zmk,combos"; combo_toki_a { key-positions = <10 11>; - bindings = <¯o_tap &kp T &kp O &kp K &kp I>; - // slow-release; + bindings = <&word_test>; + slow-release; layers = ; }; }; From 73e2a418cdf68b9bd7eaf64a08ff0b434e8d89ff Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Wed, 28 Dec 2022 00:01:24 +0100 Subject: [PATCH 7/7] test overlapping chords --- .../boards/shields/leko_pona/leko_pona.keymap | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index b7fe966..45a6255 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -48,13 +48,21 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o }; macros { - word_test: word_test { - label = "Word_test"; - compatible = "zmk,behavior-macro"; - #binding-cells = <0>; - wait-ms = <5>; - tap-ms = <5>; - bindings = <¯o_tap &kp T &kp O &kp K &kp I>; + word_test1: word_test1 { + label = "Test1"; + compatible = "zmk,behavior-macro"; + #binding-cells = <0>; + wait-ms = <5>; + tap-ms = <5>; + bindings = <¯o_tap &kp T &kp O &kp K &kp I>; + }; + word_test2: word_test2 { + label = "Test2"; + compatible = "zmk,behavior-macro"; + #binding-cells = <0>; + wait-ms = <5>; + tap-ms = <5>; + bindings = <¯o_tap &kp P &kp O &kp N &kp A>; }; }; @@ -63,8 +71,12 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o compatible = "zmk,combos"; combo_toki_a { key-positions = <10 11>; - bindings = <&word_test>; - slow-release; + bindings = <&word_test1>; + layers = ; + }; + combo_toki_b { + key-positions = <10 11 12>; + bindings = <&word_test2>; layers = ; }; };