Move combos/unicode to nodefree repo (squashed)
commit 5a54a139fb69b48c16f02d93f1fe5825b7e37580
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 17:10:12 2022 -0400
Move keypos def to nodefree repo
commit 0913280899dc3723eb8878267555a51ad0b7fed5
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 17:08:04 2022 -0400
Key position maps
commit cc5a2c7f2d840944d97e7c1b70d00675b20811e7
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 14:58:41 2022 -0400
Move international chars to nodefree repo
commit 26d4b90cc24862ce8a8fcea866e34c6f1f942db8
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 14:58:11 2022 -0400
Add international character codes
commit c21b0828da1036fb4e1e70663fef18b3297bfaeb
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 13:32:36 2022 -0400
Move keypos def to separate file
commit 814682560eb59c2980cc37af84ba2d8cc0ddafe8
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 13:23:14 2022 -0400
Rename helper.dtsi to helper.h in zmk-config
commit a71187ab35db86fa8f8be320ff1f0f1a8997f68e
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 13:21:59 2022 -0400
Rename helper.dtsi to helper.h
commit 9226fcb12959fde87855cea78e9e396935c2d55c
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 12:54:32 2022 -0400
Mirror left/right keypos def
commit 1a4e680a55ecca650649ec0586392eb0c89d643a
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:43:38 2022 -0400
Add prefix to unicode macro
commit 0e4cb3093e114d9060cd41ad191ff65802999d21
Merge: 41ec2cd 04a7df6
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:38:07 2022 -0400
Merge commit '04a7df637c524525f2964c0a35a3e187760dc79a' as 'zmk-nodefree-config'
commit 04a7df637c524525f2964c0a35a3e187760dc79a
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:38:07 2022 -0400
Squashed 'zmk-nodefree-config/' content from commit 0841d09
git-subtree-dir: zmk-nodefree-config
git-subtree-split: 0841d0948ac7389a86d15dd42baf03e2832a1b00
commit 41ec2cdb032cd605b65024e8d8fa8ea7578ed85e
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:37:58 2022 -0400
Remove old subtree
commit ac2a6c4000d480b78769e1c3f585322b724b0325
Merge: 7599487 188e189
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:32:33 2022 -0400
Merge commit '188e1891582712e06130eb794aeee34b47e2241b' as 'zmk-nodefree-config'
commit 188e1891582712e06130eb794aeee34b47e2241b
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:32:33 2022 -0400
Squashed 'zmk-nodefree-config/' content from commit bd714d8
git-subtree-dir: zmk-nodefree-config
git-subtree-split: bd714d81d177a5a4ac231b40a041c9f50c713cc5
commit 7599487fd27a382b7380ef9c37c5a6899d393fff
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:32:21 2022 -0400
Remove old subtree
commit 97b0bf3d84910f68e01f9c671e690c9f25cc7e17
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 11:30:23 2022 -0400
Move combo and unicode macros to helper.dtsi
commit 10703c087dbee780857182840749e5f1f0db25fb
Author: urob <978080+urob@users.noreply.github.com>
Date: Thu Jul 14 10:28:24 2022 -0400
Testing combo macros
This commit is contained in:
urob
parent
e402f04e60
commit
0b6979f97e
15 changed files with 507 additions and 234 deletions
|
|
@ -15,8 +15,9 @@ ISSUES, WORKAROUNDS and a "ZMK-WISHLIST"
|
|||
|
||||
#include <behaviors.dtsi>
|
||||
#include <dt-bindings/zmk/keys.h>
|
||||
#include "mouse.dtsi"
|
||||
#include "../zmk-nodefree-config/helper.dtsi"
|
||||
#include "../zmk-nodefree-config/helper.h"
|
||||
#include "../zmk-nodefree-config/international_chars/greek.dtsi"
|
||||
#include "../zmk-nodefree-config/international_chars/german.dtsi"
|
||||
|
||||
// make a 36 keys layout unless EXTRA-keys are defined in parent .keymap file
|
||||
#if !defined EXTRA_MID
|
||||
|
|
@ -42,9 +43,9 @@ ISSUES, WORKAROUNDS and a "ZMK-WISHLIST"
|
|||
#define FN 4
|
||||
#define UC 5
|
||||
|
||||
// personal combos and unicode setup, must come after layer shortcuts
|
||||
#include "combos.dtsi"
|
||||
#include "unicode.dtsi"
|
||||
// combos, german and greek letters, and mouse setup
|
||||
#include "mouse.dtsi"
|
||||
#include "combos.dtsi" // must come after layer shortcuts
|
||||
|
||||
// sticky key config
|
||||
&sk {
|
||||
|
|
@ -62,11 +63,11 @@ ISSUES, WORKAROUNDS and a "ZMK-WISHLIST"
|
|||
|
||||
/* homerow mods */
|
||||
|
||||
#define LHM LM0 LM1 LM2 LM3 // left-hand HRMs
|
||||
#define LHM LM4 LM3 LM2 LM1 // left-hand HRMs
|
||||
#define RHM RM1 RM2 RM3 RM4 // right-hand HRMs
|
||||
#define LHK LT0 LT1 LT2 LT3 LT4 LHM LM4 LB0 LB1 LB2 LB3 LB4 // left-hand keys
|
||||
#define LHK LT4 LT3 LT2 LT1 LT0 LHM LM0 LB4 LB3 LB2 LB1 LB0 // left-hand keys
|
||||
#define RHK RT0 RT1 RT2 RT3 RT4 RM0 RHM RB0 RB1 RB2 RB3 RB4 // right-hand keys
|
||||
#define THK LH0 LH1 LH2 RH0 RH1 RH2 // thumb keys
|
||||
#define THK LH2 LH1 LH0 RH0 RH1 RH2 // thumb keys
|
||||
|
||||
ZMK_BEHAVIOR(hml, hold_tap,
|
||||
flavor = "balanced";
|
||||
|
|
|
|||
|
|
@ -1,73 +1,53 @@
|
|||
/* KEY POSITIONS
|
||||
|
||||
╭─────────────────────╮ ╭─────────────────────╮
|
||||
│ LT0 LT1 LT2 LT3 LT4 │ │ RT0 RT1 RT2 RT3 RT4 │
|
||||
│ LM0 LM1 LM2 LM3 LM4 │ │ RM0 RM1 RM2 RM3 RM4 │
|
||||
│ LB0 LB1 LB2 LB3 LB4 │ │ RB0 RB1 RB2 RB3 RB4 │
|
||||
╰───────╮ LH0 LH1 LH2 │ │ RH0 RH1 RH2 ╭───────╯
|
||||
│ LT4 LT3 LT2 LT1 LT0 │ │ RT0 RT1 RT2 RT3 RT4 │
|
||||
│ LM4 LM3 LM2 LM1 LM0 │ │ RM0 RM1 RM2 RM3 RM4 │
|
||||
│ LB4 LB3 LB2 LB1 LB0 │ │ RB0 RB1 RB2 RB3 RB4 │
|
||||
╰───────╮ LH2 LH1 LH0 │ │ RH0 RH1 RH2 ╭───────╯
|
||||
╰─────────────╯ ╰─────────────╯ */
|
||||
|
||||
// must be same for all combos to avoid #986, possibly related to #905
|
||||
#define COMBO_TERM 30
|
||||
|
||||
/* Punctuation (horizontal left hand) */
|
||||
COMBO(num, &tog NUM, LT3 LT1, DEF NUM)
|
||||
COMBO(all, &kp LC(A), LT3 LT2, DEF NUM)
|
||||
COMBO(app, &kp LG(SPACE), LT2 LT1, DEF NUM)
|
||||
|
||||
// must be same to avoid #986, possibly related to #905
|
||||
#define COMBO_TERM_H 30
|
||||
#define COMBO_TERM_V 30
|
||||
COMBO(excl, &kp EXCL, LM3 LM2, DEF NUM)
|
||||
COMBO(qmark, &kp QMARK, LM2 LM1, DEF NUM)
|
||||
|
||||
#define COMBO(NAME, BINDINGS, KEYPOS, LAYERS, TERM) \
|
||||
combo_##NAME { \
|
||||
timeout-ms = <TERM>; \
|
||||
bindings = <BINDINGS>; \
|
||||
key-positions = <KEYPOS>; \
|
||||
layers = <LAYERS>; \
|
||||
};
|
||||
COMBO(cut, &kp LC(X), LB3 LB1, DEF NUM)
|
||||
COMBO(copy, &kp LC(INS), LB3 LB2, DEF NUM)
|
||||
COMBO(paste, &kp LS(INS), LB2 LB1, DEF NUM)
|
||||
|
||||
/ {
|
||||
combos {
|
||||
compatible = "zmk,combos";
|
||||
/* Brackets (horizontal right hand) */
|
||||
COMBO(lbrc, &kp LBRC, RT1 RT2, DEF NUM)
|
||||
COMBO(rbrc, &kp RBRC, RT2 RT3, DEF NUM)
|
||||
COMBO(lpar, &kp LPAR, RM1 RM2, DEF NUM)
|
||||
COMBO(rpar, &kp RPAR, RM2 RM3, DEF NUM)
|
||||
COMBO(lbrk, &kp LBKT, RB1 RB2, DEF NUM)
|
||||
COMBO(rbrk, &kp RBKT, RB2 RB3, DEF NUM)
|
||||
|
||||
/* Capsword */
|
||||
// COMBO(cpwrd, &caps_word, LM3 RM1, DEF NUM, COMBO_TERM_V)
|
||||
/* Other symbols (vertical combos) */
|
||||
COMBO(at, &kp AT, LT3 LM3, DEF NUM)
|
||||
COMBO(hash, &kp HASH, LT2 LM2, DEF NUM)
|
||||
COMBO(dllr, &kp DLLR, LT1 LM1, DEF NUM)
|
||||
COMBO(prcnt, &kp PRCNT, LT0 LM0, DEF NUM)
|
||||
|
||||
/* Punctuation (horizontal left hand) */
|
||||
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(caret, &kp CARET, RT0 RM0, DEF NUM)
|
||||
COMBO(plus, &kp PLUS, RT1 RM1, DEF NUM)
|
||||
COMBO(star, &kp STAR, RT2 RM2, DEF NUM)
|
||||
COMBO(amps, &kp AMPS, RT3 RM3, DEF NUM)
|
||||
|
||||
COMBO(excl, &kp EXCL, LM1 LM2, DEF NUM, COMBO_TERM_H)
|
||||
COMBO(qmark, &kp QMARK, LM2 LM3, DEF NUM, COMBO_TERM_H)
|
||||
COMBO(grave, &kp GRAVE, LM3 LB3, DEF NUM)
|
||||
COMBO(bslh, &kp BSLH, LM2 LB2, DEF NUM)
|
||||
COMBO(tilde, &kp TILDE, LM1 LB1, DEF NUM)
|
||||
COMBO(equal, &kp EQUAL, LM0 LB0, DEF NUM)
|
||||
|
||||
COMBO(cut, &kp LC(X), LB1 LB3, DEF NUM, COMBO_TERM_H)
|
||||
COMBO(copy, &kp LC(INS), LB1 LB2, DEF NUM, COMBO_TERM_H)
|
||||
COMBO(paste, &kp LS(INS), LB2 LB3, DEF NUM, COMBO_TERM_H)
|
||||
COMBO(under, &kp UNDER, RM0 RB0, DEF NUM)
|
||||
COMBO(minus, &kp MINUS, RM1 RB1, DEF NUM)
|
||||
COMBO(fslh, &kp FSLH, RM2 RB2, DEF NUM)
|
||||
COMBO(pipe, &kp PIPE, RM3 RB3, DEF NUM)
|
||||
|
||||
/* Brackets (horizontal right hand) */
|
||||
COMBO(lbrc, &kp LBRC, RT1 RT2, 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(at, &kp AT, LT1 LM1, DEF NUM, COMBO_TERM_V)
|
||||
COMBO(hash, &kp HASH, LT2 LM2, 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(caret, &kp CARET, RT0 RM0, DEF NUM, COMBO_TERM_V)
|
||||
COMBO(plus, &kp PLUS, RT1 RM1, DEF NUM, COMBO_TERM_V)
|
||||
COMBO(star, &kp STAR, RT2 RM2, 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)
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,62 +1,10 @@
|
|||
/* KEY POSITIONS
|
||||
/* source keypos definitions */
|
||||
#include "../zmk-nodefree-config/keypos_def/keypos_48keys_wide.h"
|
||||
|
||||
╭────────────────────╮ ╭────────╮ ╭────────────────────╮
|
||||
│ 0 1 2 3 4 │ │ 5 6 │ │ 7 8 9 10 11 │
|
||||
│ 12 13 14 15 16 │ │ 17 18 │ │ 19 20 21 22 23 │
|
||||
│ 24 25 26 27 28 │ │ 29 30 │ │ 31 32 33 34 35 │
|
||||
│ 36 37 38 39 40 │ │ 41 42 │ │ 43 44 45 46 47 │
|
||||
╰────────────────────╯ ╰────────╯ ╰────────────────────╯ */
|
||||
|
||||
|
||||
/* key positions */
|
||||
#define LT0 0 // left-top row
|
||||
#define LT1 1
|
||||
#define LT2 2
|
||||
#define LT3 3
|
||||
#define LT4 4
|
||||
|
||||
#define RT0 7 // right-top row
|
||||
#define RT1 8
|
||||
#define RT2 9
|
||||
#define RT3 10
|
||||
#define RT4 11
|
||||
|
||||
#define LM0 12 // left-middle row
|
||||
#define LM1 13
|
||||
#define LM2 14
|
||||
#define LM3 15
|
||||
#define LM4 16
|
||||
|
||||
#define RM0 19 // right-middle row
|
||||
#define RM1 20
|
||||
#define RM2 21
|
||||
#define RM3 22
|
||||
#define RM4 23
|
||||
|
||||
#define LB0 24 // left-bottom row
|
||||
#define LB1 25
|
||||
#define LB2 26
|
||||
#define LB3 27
|
||||
#define LB4 28
|
||||
|
||||
#define RB0 31 // right-bottom row
|
||||
#define RB1 32
|
||||
#define RB2 33
|
||||
#define RB3 34
|
||||
#define RB4 35
|
||||
|
||||
#define LH0 38 // left thumb keys
|
||||
#define LH1 39
|
||||
#define LH2 40
|
||||
|
||||
#define RH0 43 // right thumb keys
|
||||
#define RH1 44
|
||||
#define RH2 45
|
||||
|
||||
/* extra keys */
|
||||
#define EXTRA_MID &none &none
|
||||
#define EXTRA_BOT_L &none &kp LGUI
|
||||
#define EXTRA_BOT_R &mwh SCROLL_DOWN &mwh SCROLL_UP
|
||||
/* map Planck's extra keys */
|
||||
#define EXTRA_MID &none &none // 3x2 middle keys
|
||||
#define EXTRA_BOT_L &none &kp LGUI // 1x2 bottom left keys
|
||||
#define EXTRA_BOT_R &mwh SCROLL_DOWN &mwh SCROLL_UP // 1x2 bottom right keys
|
||||
|
||||
/* source the main keymap */
|
||||
#include "base.keymap"
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
/* OS specific sequence to initialize/end unicode input */
|
||||
#define OS_LEAD &kp RALT &kp U // Windows (requires WinCompose)
|
||||
#define OS_TRAIL &kp RET
|
||||
|
||||
/* Preprocessor macros */
|
||||
#define STRINGIFY(s) #s
|
||||
#define UC_MACRO(NAME, UNICODE_BINDING) \
|
||||
macros { \
|
||||
NAME: NAME { \
|
||||
compatible = "zmk,behavior-macro"; \
|
||||
label = STRINGIFY(ZM_ ## NAME); \
|
||||
wait-ms = <0>; \
|
||||
tap-ms = <1>; \
|
||||
#binding-cells = <0>; \
|
||||
bindings = <OS_LEAD UNICODE_BINDING OS_TRAIL>; \
|
||||
}; \
|
||||
};
|
||||
|
||||
#define UC_MODMORPH(NAME, BINDING, SHIFTED_BINDING) \
|
||||
behaviors { \
|
||||
NAME: NAME { \
|
||||
compatible = "zmk,behavior-mod-morph"; \
|
||||
label = STRINGIFY(MM_ ## NAME); \
|
||||
#binding-cells = <0>; \
|
||||
bindings = <BINDING>, <SHIFTED_BINDING>; \
|
||||
mods = <(MOD_LSFT|MOD_RSFT)>; \
|
||||
masked_mods = <(MOD_LSFT|MOD_RSFT)>; \
|
||||
}; \
|
||||
};
|
||||
|
||||
#define UNICODE_SINGLE(NAME, L0, L1, L2, L3) \
|
||||
UC_MACRO(uc_lower_ ## NAME, &kp L0 &kp L1 &kp L2 &kp L3) \
|
||||
UC_MODMORPH(uc_ ## NAME, &uc_lower_ ## NAME, &none)
|
||||
|
||||
#define UNICODE_PAIR(NAME, L0, L1, L2, L3, U0, U1, U2, U3) \
|
||||
UC_MACRO(uc_lower_ ## NAME, &kp L0 &kp L1 &kp L2 &kp L3) \
|
||||
UC_MACRO(uc_upper_ ## NAME, &kp U0 &kp U1 &kp U2 &kp U3) \
|
||||
UC_MODMORPH(uc_ ## NAME, &uc_lower_ ## NAME, &uc_upper_ ## NAME)
|
||||
|
||||
/* User definitions */
|
||||
/ {
|
||||
|
||||
UNICODE_SINGLE( alpha, N0, N3, B, N1)
|
||||
UNICODE_SINGLE( beta, N0, N3, B, N2)
|
||||
UNICODE_PAIR( gamma, N0, N3, B, N3, N0, N3, N9, N3)
|
||||
UNICODE_PAIR( delta, N0, N3, B, N4, N0, N3, N9, N4)
|
||||
UNICODE_SINGLE( epsilon, N0, N3, F, N5) // varepsilon = 03B5
|
||||
UNICODE_SINGLE( zeta, N0, N3, B, N6)
|
||||
UNICODE_SINGLE( eta, N0, N3, B, N7)
|
||||
UNICODE_PAIR( theta, N0, N3, B, N8, N0, N3, N9, N8)
|
||||
UNICODE_SINGLE( iota, N0, N3, B, N9)
|
||||
UNICODE_SINGLE( kappa, N0, N3, B, A)
|
||||
UNICODE_PAIR( lambda, N0, N3, B, B, N0, N3, N9, B)
|
||||
UNICODE_SINGLE( mu, N0, N3, B, C)
|
||||
UNICODE_SINGLE( nu, N0, N3, B, D)
|
||||
UNICODE_PAIR( xi, N0, N3, B, E, N0, N3, N9, E)
|
||||
UNICODE_PAIR( pi, N0, N3, C, N0, N0, N3, A, N0)
|
||||
UNICODE_SINGLE( rho, N0, N3, C, N1)
|
||||
UNICODE_PAIR( sigma, N0, N3, C, N3, N0, N3, A, N3)
|
||||
UNICODE_SINGLE( tau, N0, N3, C, N4)
|
||||
UNICODE_PAIR( upsilon, N0, N3, C, N5, N0, N3, A, N5)
|
||||
UNICODE_PAIR( phi, N0, N3, C, N6, N0, N3, A, N6) // varphi = 03C6
|
||||
UNICODE_SINGLE( chi, N0, N3, C, N7)
|
||||
UNICODE_PAIR( psi, N0, N3, C, N8, N0, N3, A, N8)
|
||||
UNICODE_PAIR( omega, N0, N3, C, N9, N0, N3, A, N9)
|
||||
|
||||
UNICODE_PAIR( ae, N0, N0, E, N4, N0, N0, C, N4)
|
||||
UNICODE_PAIR( oe, N0, N0, F, N6, N0, N0, D, N6)
|
||||
UNICODE_PAIR( ue, N0, N0, F, C, N0, N0, D, C)
|
||||
UNICODE_SINGLE( eszett, N0, N0, D, F)
|
||||
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue