From cff12bc7077c74aa6b8a2ab56be241cd57d11e8e Mon Sep 17 00:00:00 2001 From: Nicolas Symeou <30805864+Incblob@users.noreply.github.com> Date: Sun, 3 Nov 2024 13:46:06 +0100 Subject: [PATCH] tests --- config/boards/shields/horizon/behaviors.dtsi | 10 +++-- config/boards/shields/horizon/combos.dtsi | 4 +- .../shields/horizon/horizon_layers.dtsi | 37 ++++++++++++------- config/boards/shields/horizon/macros.dtsi | 10 ++++- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/config/boards/shields/horizon/behaviors.dtsi b/config/boards/shields/horizon/behaviors.dtsi index 1eca355..11c429b 100644 --- a/config/boards/shields/horizon/behaviors.dtsi +++ b/config/boards/shields/horizon/behaviors.dtsi @@ -1,7 +1,7 @@ #define my_tapping_term 170 -#define TD_template compatible = "zmk,behavior-tap-dance"; #binding-cells = <0>; tapping-term-ms = +#define TD_template compatible = "zmk,behavior-tap-dance"; #binding-cells = <0>; tapping-term-ms = <200> #define my_hrm_config \ compatible = "zmk,behavior-hold-tap"; \ @@ -47,7 +47,7 @@ behaviors { TD_template; bindings = <&mt &colon_space_cap &dot_space_cap> , - , <&kp DOT &kp DOT &kp DOT>; + , <&dotdotdot>; }; td_comma: td_comma { @@ -66,7 +66,11 @@ behaviors { TD_template; bindings = <&mt ¯o_QU_cap ¯o_QU>, ; }; - + + td_qu_test: td_qu_test { + TD_template; + bindings = <¯o_QU>, <¯o_QU_cap>; + }; // shift_qu: shift_qu_macro { // my_lk_config; // bindings = <¯o_QU_cap>, <¯o_QU>; diff --git a/config/boards/shields/horizon/combos.dtsi b/config/boards/shields/horizon/combos.dtsi index be1c871..7619c64 100644 --- a/config/boards/shields/horizon/combos.dtsi +++ b/config/boards/shields/horizon/combos.dtsi @@ -30,8 +30,8 @@ combos { COMBO_LAYER(enter, &mt LS(ENTER) ENTER, RB3 RB4, ) COMBO_LAYER(ctl_bsb, &kp LC(BSPC), RB2 RB3, ) -COMBO_LAYER(end, &kp END, RM2 RM3, ) -COMBO_LAYER(home, &kp HOME, RM1 RM2, ) +COMBO_LAYER(end, &kp END, RM2 RM3, ) +COMBO_LAYER(home, &kp HOME, RM1 RM2, ) // // H Digraphs diff --git a/config/boards/shields/horizon/horizon_layers.dtsi b/config/boards/shields/horizon/horizon_layers.dtsi index 193bf1f..c615c3e 100644 --- a/config/boards/shields/horizon/horizon_layers.dtsi +++ b/config/boards/shields/horizon/horizon_layers.dtsi @@ -2,14 +2,13 @@ default_layer { bindings = < - &kp ESC AS(F12) AS(W) AS(F) AS(P) AS(B) AS(J) AS(L) AS(U) AS(Z) &as LC(G) LC(F) &kp LC(HOME) - &kp LSHFT AS(Q) AS(R) AS(S) AS(T) AS(G) AS(M) AS(N) AS(E) AS(I) AS(NON_US_HASH) &kp LC(END) - AS(TAB) AS(A) AS(X) AS(C) AS(D) AS(V) &kp LS(LC(LALT)) &caps_word AS(K) AS(H) &td_comma &td_dot AS(O) AS(RET) - &kp LCTRL AS(Y) &kp LGUI &kp LG(LS(S)) &mt LALT ESC < l_L SPACE &kp BSPC &kp DELETE < l_R SPACE AS(FSLH) &kp LEFT &kp UP &kp DOWN &kp RIGHT + &kp ESC AS(F12) AS(W) AS(F) AS(P) AS(B) AS(J) AS(L) AS(U) AS(Z) &as LC(G) LC(F) &kp LC(HOME) + &kp LSHFT AS(Q) AS(R) AS(S) AS(T) AS(G) AS(M) AS(N) AS(E) AS(I) AS(NON_US_HASH) &kp LC(END) + AS(TAB) AS(A) AS(X) AS(C) AS(D) AS(V) &kp LS(LC(LALT)) &caps_word AS(K) AS(H) &comma_space &td_dot AS(O) AS(RET) + &kp LCTRL AS(Y) &kp LGUI &kp LG(LS(S)) &mt LALT ESC < l_L SPACE &kp BSPC &kp DELETE < l_R SPACE AS(FSLH) &kp LEFT &kp UP &kp DOWN &kp RIGHT >; }; - coding_layer { bindings = < @@ -20,6 +19,25 @@ coding_layer { >; }; + handsdown { + + bindings = < + &kp ESC AS(F12) AS(W) AS(M) AS(G) AS(J) &td_qu_test &td_dot &td_qu AS(Y) &as LC(G) LC(F) &kp LC(HOME) + &kp LSHFT AS(X) AS(C) AS(N) AS(T) AS(K) &td_comma AS(A) AS(E) AS(I) AS(F) &kp LC(END) + AS(TAB) AS(S) AS(P) AS(L) AS(D) AS(V) &kp LS(LC(LALT)) &caps_word AS(NON_US_HASH) AS(U) AS(O) AS(Z) AS(H) AS(RET) + &kp LCTRL AS(B) &kp LGUI &kp LG(LS(S)) &mt LALT ESC < l_L SPACE &kp BSPC &mt LSHIFT DELETE &td_r AS(FSLH) &kp LEFT &kp UP &kp DOWN &kp RIGHT + >; +}; + +handsdown_code { + bindings = < + &trans &trans &trans &trans &trans &trans &trans AS(DOT) &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans AS(COMMA) &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + >; +}; + left_layer { @@ -74,12 +92,3 @@ gaming_layer2 { >; }; - handsdown { - - bindings = < - &kp ESC AS(F12) AS(W) AS(M) AS(G) AS(J) &none &td_dot &td_qu AS(Z) &as LC(G) LC(F) &kp LC(HOME) - &kp LSHFT AS(X) AS(C) AS(N) AS(T) AS(K) &td_comma AS(A) AS(E) AS(I) AS(F) &kp LC(END) - AS(TAB) AS(S) AS(P) AS(L) AS(D) AS(V) &kp LS(LC(LALT)) &caps_word AS(NON_US_HASH) AS(U) AS(O) AS(Y) AS(H) AS(RET) - &kp LCTRL AS(B) &kp LGUI &kp LG(LS(S)) &mt LALT ESC < l_L SPACE &kp BSPC &mt LSHIFT DELETE &td_r AS(FSLH) &kp LEFT &kp UP &kp DOWN &kp RIGHT - >; -}; \ No newline at end of file diff --git a/config/boards/shields/horizon/macros.dtsi b/config/boards/shields/horizon/macros.dtsi index 9aa72b3..4d5a8c8 100644 --- a/config/boards/shields/horizon/macros.dtsi +++ b/config/boards/shields/horizon/macros.dtsi @@ -1,5 +1,5 @@ -#define MACRO_WAIT 50 -#define MACRO_TAP 40 +#define MACRO_WAIT 35 +#define MACRO_TAP 35 macros { ZMK_MACRO(line_select, @@ -37,6 +37,12 @@ macros { tap-ms = ; bindings = < &kp LS(DOT) &kp SPACE &sk LSHIFT>; ) + ) + ZMK_MACRO(dotdotdot, + wait-ms = ; + tap-ms = ; + bindings = < &kp DOT &kp DOT &kp DOT>; + ) // Alphas