ficd/zmk
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use updated helper macros for combos

Browse source
This commit is contained in:
urob 2022-08-05 10:44:20 -04:00
parent b49fe54af9
commit 6326048e47
1 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

71
config/combos.dtsi
View file

@ -7,52 +7,53 @@
╰───────╮ LH2 LH1 LH0 │ │ RH0 RH1 RH2 ╭───────╯ ╰───────╮ LH2 LH1 LH0 │ │ RH0 RH1 RH2 ╭───────╯
╰─────────────╯ ╰─────────────╯ */ ╰─────────────╯ ╰─────────────╯ */
// COMBO_TERM must be same for all combos to avoid #986, possibly related to #905 // use global-quick-tap-ms for combos (requires PR 1387)
#undef COMBO_ADD_ON
#define COMBO_ADD_ON global-quick-tap-ms = <150>;
#define COMBO_TERM_FAST 20 #define COMBO_TERM_FAST 20
#define COMBO_TERM_SLOW 35 #define COMBO_TERM_SLOW 35
#undef COMBO_QUICK_TAP_MS
#define COMBO_QUICK_TAP_MS 150
/* Punctuation (horizontal left hand) */ /* Punctuation (horizontal left hand) */
ZMK_COMBO(num, &tog NUM, LT3 LT1, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(num, &tog NUM, LT3 LT1, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(all, &kp LC(A), LT3 LT2, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(all, &kp LC(A), LT3 LT2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(app, &kp LG(SPACE), LT2 LT1, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(app, &kp LG(SPACE), LT2 LT1, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(excl, &kp EXCL, LM3 LM2, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(excl, &kp EXCL, LM3 LM2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(qmark, &kp QMARK, LM2 LM1, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(qmark, &kp QMARK, LM2 LM1, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(cut, &kp LC(X), LB3 LB1, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(cut, &kp LC(X), LB3 LB1, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(copy, &kp LC(INS), LB3 LB2, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(copy, &kp LC(INS), LB3 LB2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(paste, &kp LS(INS), LB2 LB1, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(paste, &kp LS(INS), LB2 LB1, DEF NUM, COMBO_TERM_FAST)
/* Brackets (horizontal right hand) */ /* Brackets (horizontal right hand) */
ZMK_COMBO(lbrc, &kp LBRC, RT1 RT2, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(lbrc, &kp LBRC, RT1 RT2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(rbrc, &kp RBRC, RT2 RT3, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(rbrc, &kp RBRC, RT2 RT3, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(lpar, &kp LPAR, RM1 RM2, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(lpar, &kp LPAR, RM1 RM2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(rpar, &kp RPAR, RM2 RM3, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(rpar, &kp RPAR, RM2 RM3, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(lbrk, &kp LBKT, RB1 RB2, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(lbrk, &kp LBKT, RB1 RB2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(rbrk, &kp RBKT, RB2 RB3, DEF NUM, COMBO_TERM_FAST) ZMK_COMBO_ADV(rbrk, &kp RBKT, RB2 RB3, DEF NUM, COMBO_TERM_FAST)
/* Other symbols (vertical combos) */ /* Other symbols (vertical combos) */
ZMK_COMBO(at, &kp AT, LT3 LM3, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(at, &kp AT, LT3 LM3, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(hash, &kp HASH, LT2 LM2, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(hash, &kp HASH, LT2 LM2, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(dllr, &kp DLLR, LT1 LM1, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(dllr, &kp DLLR, LT1 LM1, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(prcnt, &kp PRCNT, LT0 LM0, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(prcnt, &kp PRCNT, LT0 LM0, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(caret, &kp CARET, RT0 RM0, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(caret, &kp CARET, RT0 RM0, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(plus, &kp PLUS, RT1 RM1, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(plus, &kp PLUS, RT1 RM1, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(star, &kp STAR, RT2 RM2, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(star, &kp STAR, RT2 RM2, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(amps, &kp AMPS, RT3 RM3, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(amps, &kp AMPS, RT3 RM3, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(grave, &kp GRAVE, LM3 LB3, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(grave, &kp GRAVE, LM3 LB3, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(bslh, &kp BSLH, LM2 LB2, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(bslh, &kp BSLH, LM2 LB2, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(tilde, &kp TILDE, LM1 LB1, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(tilde, &kp TILDE, LM1 LB1, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(equal, &kp EQUAL, LM0 LB0, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(equal, &kp EQUAL, LM0 LB0, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(under, &kp UNDER, RM0 RB0, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(under, &kp UNDER, RM0 RB0, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(minus, &kp MINUS, RM1 RB1, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(minus, &kp MINUS, RM1 RB1, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(fslh, &kp FSLH, RM2 RB2, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(fslh, &kp FSLH, RM2 RB2, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(pipe, &kp PIPE, RM3 RB3, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(pipe, &kp PIPE, RM3 RB3, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(grk, &sl UC, RT1 RT3, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(grk, &sl UC, RT1 RT3, DEF NUM, COMBO_TERM_SLOW)
ZMK_COMBO(cpgrk, &sls 0, RT1 RT2 RT3, DEF NUM, COMBO_TERM_SLOW) ZMK_COMBO_ADV(cpgrk, &sls 0, RT1 RT2 RT3, DEF NUM, COMBO_TERM_SLOW)