diff options
Diffstat (limited to 'keyboards/planck/keymaps/hieax')
| -rw-r--r-- | keyboards/planck/keymaps/hieax/common/chord_layout.h | 24 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/hieax/common/number_fkey_layout.h | 26 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/hieax/common/steno_layout.h | 24 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h | 24 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/hieax/common/toggle_layout.h | 62 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/hieax/config.h | 2 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/hieax/hiea.h | 72 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/hieax/keymap.c | 27 |
8 files changed, 127 insertions, 134 deletions
diff --git a/keyboards/planck/keymaps/hieax/common/chord_layout.h b/keyboards/planck/keymaps/hieax/common/chord_layout.h index 2c785d56ca..b6922705f3 100644 --- a/keyboards/planck/keymaps/hieax/common/chord_layout.h +++ b/keyboards/planck/keymaps/hieax/common/chord_layout.h @@ -14,12 +14,12 @@ // | | | | | | | | f() | | | | | see _PLOVER // '-----------------------------------------------------------------------------------' - [_EDIT] = { - {_______, _______, TMCOPY, TMPASTE, _______, _______, _______, _______, _______, _______, _______, _______}, - {UNDO, CUT, COPY, PASTE, _______, _______, _______, _______, TD_PRIV, TD_SEND, _______, _______}, - {_______, _______, NAK, EOT, _______, _______, _______, _______, _______, _______, _______, _______}, - {_______, _______, _______, _______, _______, _______, ___fn__, ___fn__, _______, _______, _______, _______}, - }, + [_EDIT] = LAYOUT_planck_grid( + _______, _______, TMCOPY, TMPASTE, _______, _______, _______, _______, _______, _______, _______, _______, + UNDO, CUT, COPY, PASTE, _______, _______, _______, _______, TD_PRIV, TD_SEND, _______, _______, + _______, _______, NAK, EOT, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, ___fn__, ___fn__, _______, _______, _______, _______ + ), // ................................................................ Adjust Layer @@ -33,9 +33,9 @@ // | | | | f() | | | | | f() | | | | // `-----------------------------------------------------------------------------------' - [_ADJUST] = { - {PLOVER, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, - {AU_ON, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, - {RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, - {_______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______}, - }, + [_ADJUST] = LAYOUT_planck_grid( + PLOVER, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + AU_ON, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______ + ), diff --git a/keyboards/planck/keymaps/hieax/common/number_fkey_layout.h b/keyboards/planck/keymaps/hieax/common/number_fkey_layout.h index 321482b291..c3d5c2d874 100644 --- a/keyboards/planck/keymaps/hieax/common/number_fkey_layout.h +++ b/keyboards/planck/keymaps/hieax/common/number_fkey_layout.h @@ -14,16 +14,16 @@ // | | | | f() | | | | = | 0 | | | | // '-----------------------------------------------------------------------------------' - [_NUMBER] = { - {_______, KC_F, MT_E, KC_D, _______, ___x___, ___x___, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR}, - {OS_GUI, GT_C, AT_B, ST_A, _______, ___x___, ___x___, TD_DOT, KC_4, KC_5, KC_6, KC_MINS}, - {_______, KC_HASH, SM_G, KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1, KC_2, KC_3, KC_PLUS}, + [_NUMBER] = LAYOUT_planck_grid( + _______, KC_F, MT_E, KC_D, _______, ___x___, ___x___, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR, + OS_GUI, GT_C, AT_B, ST_A, _______, ___x___, ___x___, TD_DOT, KC_4, KC_5, KC_6, KC_MINS, + _______, KC_HASH, SM_G, KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1, KC_2, KC_3, KC_PLUS, #ifdef THUMB_0 - {___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0, LT_EQL, ___x___, ___x___, ___x___}, + ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0, LT_EQL, ___x___, ___x___, ___x___ #else - {___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL, LT_0, ___x___, ___x___, ___x___}, + ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL, LT_0, ___x___, ___x___, ___x___ #endif - }, + ), // ............ .................................................. Function Keys @@ -38,9 +38,9 @@ // | | | | | f() | | | + | | | | | see _PLOVER // '-----------------------------------------------------------------------------------' - [_FNCKEY] = { - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7, KC_F8, KC_F9, KC_F12 }, - {OS_GUI, OS_CTL, OS_ALT, OS_SFT, _______, ___x___, ___x___, _______, KC_F4, KC_F5, KC_F6, KC_F11 }, - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1, KC_F2, KC_F3, KC_F10 }, - {_______, _______, _______, _______, ___fn__, ___fn__, _______, KC_PLUS, _______, _______, _______, _______}, - }, + [_FNCKEY] = LAYOUT_planck_grid( + _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7, KC_F8, KC_F9, KC_F12 , + OS_GUI, OS_CTL, OS_ALT, OS_SFT, _______, ___x___, ___x___, _______, KC_F4, KC_F5, KC_F6, KC_F11 , + _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1, KC_F2, KC_F3, KC_F10 , + _______, _______, _______, _______, ___fn__, ___fn__, _______, KC_PLUS, _______, _______, _______, _______ + ), diff --git a/keyboards/planck/keymaps/hieax/common/steno_layout.h b/keyboards/planck/keymaps/hieax/common/steno_layout.h index ab4a6fe011..c1f2b5b24a 100644 --- a/keyboards/planck/keymaps/hieax/common/steno_layout.h +++ b/keyboards/planck/keymaps/hieax/common/steno_layout.h @@ -13,12 +13,12 @@ // | | A | O | E | U | | // `-----------------------------------------------------------------------------------' - [_PLOVER] = { - {STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, STN_N6, STN_N7, STN_N8, STN_N9, STN_NA, STN_NB, STN_NC }, - {BASE1, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR }, - {BASE2, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR }, - {_______, _______, _______, PS_STNA, PS_STNO, _______, _______, PS_STNE, PS_STNU, _______, _______, _______}, - }, + [_PLOVER] = LAYOUT_planck_grid( + STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, STN_N6, STN_N7, STN_N8, STN_N9, STN_NA, STN_NB, STN_NC , + BASE1, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR , + BASE2, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR , + _______, _______, _______, PS_STNA, PS_STNO, _______, _______, PS_STNE, PS_STNU, _______, _______, _______ + ), #else // ,-----------------------------------------------------------------------------------. // | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | @@ -30,10 +30,10 @@ // | | A | O | E | U | | // `-----------------------------------------------------------------------------------' - [_PLOVER] = { - {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, - {BASE1, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, - {BASE2, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, - {_______, _______, _______, LT_C, LT_V, _______, _______, LT_N, LT_M, _______, _______, _______}, - }, + [_PLOVER] = LAYOUT_planck_grid( + KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , + BASE1, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + BASE2, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + _______, _______, _______, LT_C, LT_V, _______, _______, LT_N, LT_M, _______, _______, _______ + ), #endif diff --git a/keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h b/keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h index 677e46409b..4a32f71bd9 100644 --- a/keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h +++ b/keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h @@ -13,12 +13,12 @@ // | |Adjust| \ | | f() | | // '-----------------------------------------------------------------------------------' - [_SYMBOL] = { - {_______, KC_TILD, KC_ASTR, KC_AMPR, _______, ___x___, ___x___, _______, KC_HOME, KC_UP, KC_END, KC_PGUP}, - {OS_GUI, SM_CIRC, SM_PERC, SM_DLR, _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN}, - {_______, KC_HASH, KC_AT, KC_EXLM, _______, ___x___, ___x___, _______, _______, _______, _______, _______}, - {___x___, ___x___, ___x___, ADJUST, LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___}, - }, + [_SYMBOL] = LAYOUT_planck_grid( + _______, KC_TILD, KC_ASTR, KC_AMPR, _______, ___x___, ___x___, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, + OS_GUI, SM_CIRC, SM_PERC, SM_DLR, _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, + _______, KC_HASH, KC_AT, KC_EXLM, _______, ___x___, ___x___, _______, _______, _______, _______, _______, + ___x___, ___x___, ___x___, ADJUST, LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___ + ), // ............................................................... Mouse Actions @@ -32,9 +32,9 @@ // | | | f() | | f() | | // '-----------------------------------------------------------------------------------' - [_MOUSE] = { - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U}, - {_______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D}, - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______}, - {_______, _______, _______, _______, ___fn__, _______, _______, _______, ___fn__, _______, _______, _______}, - }, + [_MOUSE] = LAYOUT_planck_grid( + _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U, + _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, + _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______, + _______, _______, _______, _______, ___fn__, _______, _______, _______, ___fn__, _______, _______, _______ + ), diff --git a/keyboards/planck/keymaps/hieax/common/toggle_layout.h b/keyboards/planck/keymaps/hieax/common/toggle_layout.h index ea4ead56b9..cf3138d6e3 100644 --- a/keyboards/planck/keymaps/hieax/common/toggle_layout.h +++ b/keyboards/planck/keymaps/hieax/common/toggle_layout.h @@ -14,16 +14,16 @@ // | | | | f() | Space| | | = | 0 | | | | // '-----------------------------------------------------------------------------------' - [_TTNUMBER] = { - {_______, KC_F, MT_E, KC_D, _______, ___x___, ___x___, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR}, - {OS_GUI, GT_C, AT_B, ST_A, _______, ___x___, ___x___, TD_DOT, KC_4, KC_5, KC_6, KC_MINS}, - {_______, KC_HASH, SM_G, KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1, KC_2, KC_3, KC_PLUS}, + [_TTNUMBER] = LAYOUT_planck_grid( + _______, KC_F, MT_E, KC_D, _______, ___x___, ___x___, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR, + OS_GUI, GT_C, AT_B, ST_A, _______, ___x___, ___x___, TD_DOT, KC_4, KC_5, KC_6, KC_MINS, + _______, KC_HASH, SM_G, KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1, KC_2, KC_3, KC_PLUS, #ifdef THUMB_0 - {_______, _______, _______, TT_ESC, KC_SPC, _______, _______, KC_0, LT_EQL, _______, _______, _______}, + _______, _______, _______, TT_ESC, KC_SPC, _______, _______, KC_0, LT_EQL, _______, _______, _______ #else - {_______, _______, _______, TT_ESC, KC_SPC, _______, _______, KC_EQL, LT_0, _______, _______, _______}, + _______, _______, _______, TT_ESC, KC_SPC, _______, _______, KC_EQL, LT_0, _______, _______, _______ #endif - }, + ), // ............ .................................................. Function Keys @@ -37,12 +37,12 @@ // | | | | f() | | | | + | | | | | // '-----------------------------------------------------------------------------------' - [_TTFNCKEY] = { - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7, KC_F8, KC_F9, KC_F12 }, - {OS_GUI, OS_CTL, OS_ALT, OS_SFT, _______, ___x___, ___x___, _______, KC_F4, KC_F5, KC_F6, KC_F11 }, - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1, KC_F2, KC_F3, KC_F10 }, - {_______, _______, _______, TT_ESC, _______, _______, _______, KC_PLUS, _______, _______, _______, _______}, - }, + [_TTFNCKEY] = LAYOUT_planck_grid( + _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7, KC_F8, KC_F9, KC_F12 , + OS_GUI, OS_CTL, OS_ALT, OS_SFT, _______, ___x___, ___x___, _______, KC_F4, KC_F5, KC_F6, KC_F11 , + _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1, KC_F2, KC_F3, KC_F10 , + _______, _______, _______, TT_ESC, _______, _______, _______, KC_PLUS, _______, _______, _______, _______ + ), // ....................................................................... Regex @@ -56,12 +56,12 @@ // | | | | f() | = | | | + | Space| | | | // `-----------------------------------------------------------------------------------' - [_TTREGEX] = { - {___x___, KC_DOT, KC_ASTR, KC_AMPR, KC_TILD, ___x___, ___x___, KC_GRV, KC_LBRC, KC_RBRC, KC_CIRC, ___x___}, - {___x___, KC_LT, KC_PERC, KC_GT, KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR, ___x___}, - {___x___, KC_COLN, KC_AT, KC_EXLM, KC_SLSH, ___x___, ___x___, KC_BSLS, KC_LCBR, KC_RCBR, KC_HASH, ___x___}, - {_______, _______, _______, TT_ESC, KC_EQL, _______, _______, KC_PLUS, KC_SPC, _______, _______, _______}, - }, + [_TTREGEX] = LAYOUT_planck_grid( + ___x___, KC_DOT, KC_ASTR, KC_AMPR, KC_TILD, ___x___, ___x___, KC_GRV, KC_LBRC, KC_RBRC, KC_CIRC, ___x___, + ___x___, KC_LT, KC_PERC, KC_GT, KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR, ___x___, + ___x___, KC_COLN, KC_AT, KC_EXLM, KC_SLSH, ___x___, ___x___, KC_BSLS, KC_LCBR, KC_RCBR, KC_HASH, ___x___, + _______, _______, _______, TT_ESC, KC_EQL, _______, _______, KC_PLUS, KC_SPC, _______, _______, _______ + ), // ............................................................ Navigation Layer @@ -75,12 +75,12 @@ // | | | | f() | | | | | | | | | // '-----------------------------------------------------------------------------------' - [_TTCURSOR] = { - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP, KC_END, KC_PGUP}, - {OS_GUI, OS_CTL, OS_ALT, OS_SFT, _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN}, - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______}, - {_______, _______, _______, TT_ESC, _______, _______, _______, _______, _______, _______, _______, _______}, - }, + [_TTCURSOR] = LAYOUT_planck_grid( + _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, + OS_GUI, OS_CTL, OS_ALT, OS_SFT, _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, + _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______, + _______, _______, _______, TT_ESC, _______, _______, _______, _______, _______, _______, _______, _______ + ), // ............................................................... Mouse Actions @@ -94,9 +94,9 @@ // | | | | f() | | | | | | | | | // '-----------------------------------------------------------------------------------' - [_TTMOUSE] = { - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U}, - {_______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D}, - {_______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______}, - {_______, _______, _______, TT_ESC, _______, _______, _______, _______, _______, _______, _______, _______}, - }, + [_TTMOUSE] = LAYOUT_planck_grid( + _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U, + _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, + _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______, + _______, _______, _______, TT_ESC, _______, _______, _______, _______, _______, _______, _______, _______ + ), diff --git a/keyboards/planck/keymaps/hieax/config.h b/keyboards/planck/keymaps/hieax/config.h index 655cdf5db3..eb86704578 100644 --- a/keyboards/planck/keymaps/hieax/config.h +++ b/keyboards/planck/keymaps/hieax/config.h @@ -14,7 +14,7 @@ // #define MOUSEKEY_WHEEL_DELAY 0 // compile time macro string, see functions/hardware planck script (undefine otherwise) -#define PRIVATE_STRING +//#define PRIVATE_STRING // compile time macro string, must be in quotes #define PUBLIC_STRING ":%s/arch=(.*)/arch=('any')\n" diff --git a/keyboards/planck/keymaps/hieax/hiea.h b/keyboards/planck/keymaps/hieax/hiea.h index 64541d633e..38077e8eeb 100644 --- a/keyboards/planck/keymaps/hieax/hiea.h +++ b/keyboards/planck/keymaps/hieax/hiea.h @@ -13,19 +13,19 @@ // | Ctrl | GUI | Alt | Esc | Space| Ins | Left | Ent | Bksp | Down | Up | Right| // `-----------------------------------------------------------------------------------' - [_BASE] = { - {KC_Q, KC_Y, KC_O, KC_U, KC_Z, CNTR_TL, CNTR_TR, KC_G, KC_D, KC_N, KC_M, KC_X }, - {HOME_H, HOME_I, HOME_E, HOME_A, KC_DOT, CNTR_HL, CNTR_HR, KC_C, HOME_T, HOME_R, HOME_S, HOME_W }, - {KC_J, KC_SCLN, TD_QUOT, KC_K, KC_COMM, CNTR_BL, CNTR_BR, KC_B, KC_P, KC_L, KC_F, KC_V }, - {OS_CTL, OS_GUI, OS_ALT, LT_ESC, TD_SPC, LT_INS, SP_LEFT, TD_ENT, SP_BSPC, AT_DOWN, GT_UP, CT_RGHT}, - }, + [_BASE] = LAYOUT_planck_grid( + KC_Q, KC_Y, KC_O, KC_U, KC_Z, CNTR_TL, CNTR_TR, KC_G, KC_D, KC_N, KC_M, KC_X , + HOME_H, HOME_I, HOME_E, HOME_A, KC_DOT, CNTR_HL, CNTR_HR, KC_C, HOME_T, HOME_R, HOME_S, HOME_W , + KC_J, KC_SCLN, TD_QUOT, KC_K, KC_COMM, CNTR_BL, CNTR_BR, KC_B, KC_P, KC_L, KC_F, KC_V , + OS_CTL, OS_GUI, OS_ALT, LT_ESC, TD_SPC, LT_INS, SP_LEFT, TD_ENT, SP_BSPC, AT_DOWN, GT_UP, CT_RGHT + ), - [_SHIFT] = { - {S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X)}, - {S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_DOT, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W)}, - {S(KC_J), KC_SCLN, TD_QUOT, S(KC_K), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V)}, - {OS_CTL, OS_GUI, OS_ALT, LT_ESC, TD_SPC, LT_INS, SP_LEFT, TD_ENT, SP_BSPC, AT_DOWN, GT_UP, CT_RGHT}, - }, + [_SHIFT] = LAYOUT_planck_grid( + S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X), + S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_DOT, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W), + S(KC_J), KC_SCLN, TD_QUOT, S(KC_K), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V), + OS_CTL, OS_GUI, OS_ALT, LT_ESC, TD_SPC, LT_INS, SP_LEFT, TD_ENT, SP_BSPC, AT_DOWN, GT_UP, CT_RGHT + ), // ,-----------------------------------------------------------------------------------. // | Q | Y | O | U | Z | Shift| Caps | G | D | N | M | X | @@ -37,12 +37,12 @@ // | Ctrl | GUI | Alt | ↑Tab | f() | Ins | Left | _ | Del | Down | Up | Right| // `-----------------------------------------------------------------------------------' - [_LSHIFT] = { - {S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X)}, - {S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W)}, - {S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V)}, - {OS_CTL, OS_GUI, OS_ALT, S_TAB, ___fn__, LT_INS, S_LEFT, KC_UNDS, SP_DEL, S_DOWN, S_UP, S_RGHT }, - }, + [_LSHIFT] = LAYOUT_planck_grid( + S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X), + S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W), + S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V), + OS_CTL, OS_GUI, OS_ALT, S_TAB, ___fn__, LT_INS, S_LEFT, KC_UNDS, SP_DEL, S_DOWN, S_UP, S_RGHT + ), // ,-----------------------------------------------------------------------------------. // | Q | Y | O | U | Z | Shift| Caps | G | D | N | M | X | @@ -54,12 +54,12 @@ // | Ctrl | GUI | Alt | Tab | - | Ins | Left | f() | Bksp | Down | Up | Right| // `-----------------------------------------------------------------------------------' - [_RSHIFT] = { - {S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X)}, - {S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W)}, - {S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V)}, - {OS_CTL, OS_GUI, OS_ALT, KC_TAB, KC_MINS, LT_INS, S_LEFT, ___fn__, SP_BSPC, S_DOWN, S_UP, S_RGHT }, - }, + [_RSHIFT] = LAYOUT_planck_grid( + S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X), + S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W), + S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V), + OS_CTL, OS_GUI, OS_ALT, KC_TAB, KC_MINS, LT_INS, S_LEFT, ___fn__, SP_BSPC, S_DOWN, S_UP, S_RGHT + ), #ifdef HOME_MODS // ,-----------------------------------------------------------------------------------. // | Q | Y | O | U | Z | Fn | Caps | ` | [ | ] | ^ | X | @@ -71,12 +71,12 @@ // | Ctrl | GUI | Alt | Esc | Space| Ins | Left | + | Space| Down | Up | Right| // `-----------------------------------------------------------------------------------' - [_LSYMBOL] = { - {S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, TD_GRV, KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X)}, - {HOME_H, HOME_I, HOME_E, ___fn__, KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR, S(KC_W)}, - {S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_LCBR, KC_RCBR, KC_HASH, S(KC_V)}, - {OS_CTL, OS_GUI, OS_ALT, LT_ESC, TD_SPC, LT_INS, SP_LEFT, KC_PLUS, SL_SPC, AT_DOWN, GT_UP, CT_RGHT}, - }, + [_LSYMBOL] = LAYOUT_planck_grid( + S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, TD_GRV, KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X), + HOME_H, HOME_I, HOME_E, ___fn__, KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR, S(KC_W), + S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_LCBR, KC_RCBR, KC_HASH, S(KC_V), + OS_CTL, OS_GUI, OS_ALT, LT_ESC, TD_SPC, LT_INS, SP_LEFT, KC_PLUS, SL_SPC, AT_DOWN, GT_UP, CT_RGHT + ), // ,-----------------------------------------------------------------------------------. // | Q | . | * | & | ~ | Fn | Caps | G | D | N | M | X | @@ -89,11 +89,11 @@ // | | ↑Tab | = | Ent | Bksp | | // `-----------------------------------------------------------------------------------' - [_RSYMBOL] = { - {S(KC_Q), KC_DOT, KC_ASTR, KC_AMPR, TD_TILD, CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X)}, - {S(KC_H), TD_LT, KC_PERC, TD_GT, KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), ___fn__, HOME_R, HOME_S, HOME_W }, - {S(KC_J), TD_COLN, KC_AT, KC_EXLM, KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V)}, - {OS_CTL, OS_GUI, OS_ALT, S_TAB, TD_EQL, LT_INS, SP_LEFT, TD_ENT, LT_BSPC, AT_DOWN, GT_UP, CT_RGHT}, - }, + [_RSYMBOL] = LAYOUT_planck_grid( + S(KC_Q), KC_DOT, KC_ASTR, KC_AMPR, TD_TILD, CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X), + S(KC_H), TD_LT, KC_PERC, TD_GT, KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), ___fn__, HOME_R, HOME_S, HOME_W , + S(KC_J), TD_COLN, KC_AT, KC_EXLM, KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V), + OS_CTL, OS_GUI, OS_ALT, S_TAB, TD_EQL, LT_INS, SP_LEFT, TD_ENT, LT_BSPC, AT_DOWN, GT_UP, CT_RGHT + ), #endif #endif diff --git a/keyboards/planck/keymaps/hieax/keymap.c b/keyboards/planck/keymaps/hieax/keymap.c index 2b08506f25..80de85b884 100644 --- a/keyboards/planck/keymaps/hieax/keymap.c +++ b/keyboards/planck/keymaps/hieax/keymap.c @@ -66,17 +66,10 @@ // sudo CPATH=<keymap.c directory>/common make ... -#include "config.h" -#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example" -#include "planck.h" -#include "action_layer.h" +#include QMK_KEYBOARD_H #ifdef STENO_ENABLE #include "keymap_steno.h" #endif -#ifdef AUDIO_ENABLE -#include "audio.h" -#endif -#include "eeconfig.h" extern keymap_config_t keymap_config; @@ -171,7 +164,7 @@ enum planck_keycodes { #define S_TAB S (KC_TAB) #define S_UP S (KC_UP) -#include "tapdance.h" +#include "common/tapdance.h" // keycodes #define ___x___ KC_TRNS @@ -229,35 +222,35 @@ enum planck_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #include "hiea.h" -#include "steno_layout.h" +#include "common/steno_layout.h" // ...................................................... Number / Function Keys -#include "number_fkey_layout.h" +#include "common/number_fkey_layout.h" // ......................................................... Symbol / Navigation -#include "symbol_guifn_layout.h" +#include "common/symbol_guifn_layout.h" // ............................................................... Toggle Layers #ifdef CENTER_TT -#include "toggle_layout.h" +#include "common/toggle_layout.h" #endif // ......................................................... Short Cuts / Adjust -#include "chord_layout.h" +#include "common/chord_layout.h" }; // ...................................................................... Sounds -#include "sounds.h" +#include "common/sounds.h" // ........................................................... User Keycode Trap -#include "keycode_functions.h" +#include "common/keycode_functions.h" #define BASE_1 1 #define BASE_2 2 @@ -442,4 +435,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) return true; } -#include "init.h" +#include "common/init.h" |