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

Minor refactor of dtsi files

Browse source
This commit is contained in:
urob 2022-06-22 17:23:59 -04:00
parent dca52de4fd
commit e62e859181
2 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/base.keymap
View file

@ -53,9 +53,8 @@ TODOs and ISSUES
/ { / {
combos { #include "unicode.dtsi"
#include "combos.dtsi" #include "combos.dtsi"
};
macros { macros {
// Windows sleep key // Windows sleep key

77
config/combos.dtsi
View file

@ -7,7 +7,7 @@
╰───────╮ LH0 LH1 LH2 │ │ RH0 RH1 RH2 ╭───────╯ ╰───────╮ LH0 LH1 LH2 │ │ RH0 RH1 RH2 ╭───────╯
╰─────────────╯ ╰─────────────╯ */ ╰─────────────╯ ╰─────────────╯ */
compatible = "zmk,combos";
// must be same to avoid #986, possibly related to #905 // must be same to avoid #986, possibly related to #905
#define COMBO_TERM_H 30 #define COMBO_TERM_H 30
@ -21,47 +21,52 @@ compatible = "zmk,combos";
layers = <LAYERS>; \ layers = <LAYERS>; \
}; };
/* Capsword */ combos {
// COMBO(cpwrd, &caps_word, LM3 RM1, DEF NUM, COMBO_TERM_V)
/* Punctuation (horizontal left hand) */ compatible = "zmk,combos";
COMBO(num, &tog NUM, LT1 LT3, DEF NUM, COMBO_TERM_H)
COMBO(all, &kp LC(A), LT1 LT2, DEF NUM, COMBO_TERM_H)
COMBO(app, &kp LG(SPACE), LT2 LT3, DEF NUM, COMBO_TERM_H)
COMBO(excl, &kp EXCL, LM1 LM2, DEF NUM, COMBO_TERM_H) /* Capsword */
COMBO(qmark, &kp QMARK, LM2 LM3, DEF NUM, COMBO_TERM_H) // COMBO(cpwrd, &caps_word, LM3 RM1, DEF NUM, COMBO_TERM_V)
COMBO(cut, &kp LC(X), LB1 LB3, DEF NUM, COMBO_TERM_H) /* Punctuation (horizontal left hand) */
COMBO(copy, &kp LC(INS), LB1 LB2, DEF NUM, COMBO_TERM_H) COMBO(num, &tog NUM, LT1 LT3, DEF NUM, COMBO_TERM_H)
COMBO(paste, &kp LS(INS), LB2 LB3, DEF NUM, COMBO_TERM_H) COMBO(all, &kp LC(A), LT1 LT2, DEF NUM, COMBO_TERM_H)
COMBO(app, &kp LG(SPACE), LT2 LT3, DEF NUM, COMBO_TERM_H)
/* Brackets (horizontal right hand) */ COMBO(excl, &kp EXCL, LM1 LM2, DEF NUM, COMBO_TERM_H)
COMBO(lbrc, &kp LBRC, RT1 RT2, DEF NUM, COMBO_TERM_H) COMBO(qmark, &kp QMARK, LM2 LM3, DEF NUM, COMBO_TERM_H)
COMBO(rbrc, &kp RBRC, RT2 RT3, DEF NUM, COMBO_TERM_H)
COMBO(lpar, &kp LPAR, RM1 RM2, DEF NUM, COMBO_TERM_H)
COMBO(rpar, &kp RPAR, RM2 RM3, DEF NUM, COMBO_TERM_H)
COMBO(lbrk, &kp LBKT, RB1 RB2, DEF NUM, COMBO_TERM_H)
COMBO(rbrk, &kp RBKT, RB2 RB3, DEF NUM, COMBO_TERM_H)
/* Other symbols (vertical combos) */ COMBO(cut, &kp LC(X), LB1 LB3, DEF NUM, COMBO_TERM_H)
COMBO(at, &kp AT, LT1 LM1, DEF NUM, COMBO_TERM_V) COMBO(copy, &kp LC(INS), LB1 LB2, DEF NUM, COMBO_TERM_H)
COMBO(hash, &kp HASH, LT2 LM2, DEF NUM, COMBO_TERM_V) COMBO(paste, &kp LS(INS), LB2 LB3, DEF NUM, COMBO_TERM_H)
COMBO(dllr, &kp DLLR, LT3 LM3, DEF NUM, COMBO_TERM_V)
COMBO(prcnt, &kp PRCNT, LT4 LM4, DEF NUM, COMBO_TERM_V)
COMBO(caret, &kp CARET, RT0 RM0, DEF NUM, COMBO_TERM_V) /* Brackets (horizontal right hand) */
COMBO(plus, &kp PLUS, RT1 RM1, DEF NUM, COMBO_TERM_V) COMBO(lbrc, &kp LBRC, RT1 RT2, DEF NUM, COMBO_TERM_H)
COMBO(star, &kp STAR, RT2 RM2, DEF NUM, COMBO_TERM_V) COMBO(rbrc, &kp RBRC, RT2 RT3, DEF NUM, COMBO_TERM_H)
COMBO(amps, &kp AMPS, RT3 RM3, DEF NUM, COMBO_TERM_V) COMBO(lpar, &kp LPAR, RM1 RM2, DEF NUM, COMBO_TERM_H)
COMBO(rpar, &kp RPAR, RM2 RM3, DEF NUM, COMBO_TERM_H)
COMBO(lbrk, &kp LBKT, RB1 RB2, DEF NUM, COMBO_TERM_H)
COMBO(rbrk, &kp RBKT, RB2 RB3, DEF NUM, COMBO_TERM_H)
COMBO(grave, &kp GRAVE, LM1 LB1, DEF NUM, COMBO_TERM_V) /* Other symbols (vertical combos) */
COMBO(bslh, &kp BSLH, LM2 LB2, DEF NUM, COMBO_TERM_V) COMBO(at, &kp AT, LT1 LM1, DEF NUM, COMBO_TERM_V)
COMBO(tilde, &kp TILDE, LM3 LB3, DEF NUM, COMBO_TERM_V) COMBO(hash, &kp HASH, LT2 LM2, DEF NUM, COMBO_TERM_V)
COMBO(equal, &kp EQUAL, LM4 LB4, DEF NUM, COMBO_TERM_V) COMBO(dllr, &kp DLLR, LT3 LM3, DEF NUM, COMBO_TERM_V)
COMBO(prcnt, &kp PRCNT, LT4 LM4, DEF NUM, COMBO_TERM_V)
COMBO(under, &kp UNDER, RM0 RB0, DEF NUM, COMBO_TERM_V) COMBO(caret, &kp CARET, RT0 RM0, DEF NUM, COMBO_TERM_V)
COMBO(minus, &kp MINUS, RM1 RB1, DEF NUM, COMBO_TERM_V) COMBO(plus, &kp PLUS, RT1 RM1, DEF NUM, COMBO_TERM_V)
COMBO(fslh, &kp FSLH, RM2 RB2, DEF NUM, COMBO_TERM_V) COMBO(star, &kp STAR, RT2 RM2, DEF NUM, COMBO_TERM_V)
COMBO(pipe, &kp PIPE, RM3 RB3, DEF NUM, COMBO_TERM_V) COMBO(amps, &kp AMPS, RT3 RM3, DEF NUM, COMBO_TERM_V)
COMBO(grave, &kp GRAVE, LM1 LB1, DEF NUM, COMBO_TERM_V)
COMBO(bslh, &kp BSLH, LM2 LB2, DEF NUM, COMBO_TERM_V)
COMBO(tilde, &kp TILDE, LM3 LB3, DEF NUM, COMBO_TERM_V)
COMBO(equal, &kp EQUAL, LM4 LB4, DEF NUM, COMBO_TERM_V)
COMBO(under, &kp UNDER, RM0 RB0, DEF NUM, COMBO_TERM_V)
COMBO(minus, &kp MINUS, RM1 RB1, DEF NUM, COMBO_TERM_V)
COMBO(fslh, &kp FSLH, RM2 RB2, DEF NUM, COMBO_TERM_V)
COMBO(pipe, &kp PIPE, RM3 RB3, DEF NUM, COMBO_TERM_V)
};