mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-17 05:02:07 +00:00
3x5_3 remove layout wrapper from via keymap
- wrapper macros removed to conform with pristine keymap requirement - readded miryoku inspired ESC_MEDIA layer
This commit is contained in:
parent
83ed1b0ea3
commit
1ab771ec12
@ -22,6 +22,7 @@ enum dilemma_keymap_layers {
|
||||
LAYER_BASE = 0,
|
||||
LAYER_FUNCTION,
|
||||
LAYER_NAVIGATION,
|
||||
LAYER_MEDIA,
|
||||
LAYER_POINTER,
|
||||
LAYER_NUMERAL,
|
||||
LAYER_SYMBOLS,
|
||||
@ -30,11 +31,13 @@ enum dilemma_keymap_layers {
|
||||
// Automatically enable sniping-mode on the pointer layer.
|
||||
// #define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER
|
||||
|
||||
#define ESC_MED LT(LAYER_MEDIA, KC_ESC)
|
||||
#define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC)
|
||||
#define TAB_FUN LT(LAYER_FUNCTION, KC_TAB)
|
||||
#define ENT_SYM LT(LAYER_SYMBOLS, KC_ENT)
|
||||
#define BSP_NUM LT(LAYER_NUMERAL, KC_BSPC)
|
||||
#define _L_PTR(KC) LT(LAYER_POINTER, KC)
|
||||
#define PT_Z LT(LAYER_POINTER, KC_Z)
|
||||
#define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
|
||||
|
||||
#ifndef POINTING_DEVICE_ENABLE
|
||||
# define DRGSCRL KC_NO
|
||||
@ -45,16 +48,13 @@ enum dilemma_keymap_layers {
|
||||
|
||||
// clang-format off
|
||||
/** \brief QWERTY layout (3 rows, 10 columns). */
|
||||
#define LAYOUT_LAYER_BASE \
|
||||
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \
|
||||
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \
|
||||
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \
|
||||
CW_TOGG, TAB_FUN, SPC_NAV, ENT_SYM, BSP_NUM, KC_MUTE
|
||||
|
||||
/** Convenience row shorthands. */
|
||||
#define _______________DEAD_HALF_ROW_______________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
|
||||
#define ______________HOME_ROW_GACS_L______________ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX
|
||||
#define ______________HOME_ROW_GACS_R______________ XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[LAYER_BASE] = LAYOUT_split_3x5_3(
|
||||
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
|
||||
LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, RSFT_T(KC_J), RCTL_T(KC_K), RALT_T(KC_L), RGUI_T(KC_QUOT),
|
||||
PT_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, PT_SLSH,
|
||||
ESC_MED, TAB_FUN, SPC_NAV, ENT_SYM, BSP_NUM, KC_MUTE
|
||||
),
|
||||
|
||||
/*
|
||||
* Layers used on the Dilemma.
|
||||
@ -74,18 +74,12 @@ enum dilemma_keymap_layers {
|
||||
* column. App is on the tertiary thumb key and other thumb keys are duplicated
|
||||
* from the base layer to enable auto-repeat.
|
||||
*/
|
||||
#define LAYOUT_LAYER_FUNCTION \
|
||||
_______________DEAD_HALF_ROW_______________, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F12, \
|
||||
______________HOME_ROW_GACS_L______________, KC_SCRL, KC_F4, KC_F5, KC_F6, KC_F11, \
|
||||
_______________DEAD_HALF_ROW_______________, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10, \
|
||||
[LAYER_FUNCTION] = LAYOUT_split_3x5_3(
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F12,
|
||||
KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_SCRL, KC_F4, KC_F5, KC_F6, KC_F11,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10,
|
||||
XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
|
||||
|
||||
/** \brief Mouse emulation and pointer functions. */
|
||||
#define LAYOUT_LAYER_POINTER \
|
||||
QK_BOOT, EE_CLR, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, EE_CLR, QK_BOOT, \
|
||||
______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
|
||||
_______, DRGSCRL, SNIPING, KC_BTN3, XXXXXXX, XXXXXXX, KC_BTN3, SNIPING, DRGSCRL, _______, \
|
||||
KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, KC_BTN3
|
||||
),
|
||||
|
||||
/**
|
||||
* \brief Navigation layer.
|
||||
@ -95,11 +89,33 @@ enum dilemma_keymap_layers {
|
||||
* caps lock and insert on the inner column. Thumb keys are duplicated from the
|
||||
* base layer to avoid having to layer change mid edit and to enable auto-repeat.
|
||||
*/
|
||||
#define LAYOUT_LAYER_NAVIGATION \
|
||||
_______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \
|
||||
______________HOME_ROW_GACS_L______________, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \
|
||||
_______________DEAD_HALF_ROW_______________, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \
|
||||
[LAYER_NAVIGATION] = LAYOUT_split_3x5_3(
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,
|
||||
XXXXXXX, XXXXXXX, _______, KC_ENT, KC_BSPC, KC_DEL
|
||||
),
|
||||
|
||||
/**
|
||||
* \brief Media layer.
|
||||
*
|
||||
* Tertiary left- and right-hand layer is media and RGB control. This layer is
|
||||
* symmetrical to accomodate the left- and right-hand trackball.
|
||||
*/
|
||||
[LAYER_MEDIA] = LAYOUT_split_3x5_3(
|
||||
XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX,
|
||||
KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
_______, KC_MPLY, KC_MSTP, KC_MSTP, KC_MPLY, KC_MUTE
|
||||
),
|
||||
|
||||
/** \brief Mouse emulation and pointer functions. */
|
||||
[LAYER_POINTER] = LAYOUT_split_3x5_3(
|
||||
QK_BOOT, EE_CLR, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, EE_CLR, QK_BOOT,
|
||||
KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
|
||||
_______, DRGSCRL, SNIPING, KC_BTN3, XXXXXXX, XXXXXXX, KC_BTN3, SNIPING, DRGSCRL, _______,
|
||||
KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, KC_BTN3
|
||||
),
|
||||
|
||||
/**
|
||||
* \brief Numeral layout.
|
||||
@ -108,11 +124,12 @@ enum dilemma_keymap_layers {
|
||||
* are in the standard numpad locations with symbols in the remaining positions.
|
||||
* `KC_DOT` is duplicated from the base layer.
|
||||
*/
|
||||
#define LAYOUT_LAYER_NUMERAL \
|
||||
KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, _______________DEAD_HALF_ROW_______________, \
|
||||
KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, ______________HOME_ROW_GACS_R______________, \
|
||||
KC_DOT, KC_1, KC_2, KC_3, KC_BSLS, _______________DEAD_HALF_ROW_______________, \
|
||||
[LAYER_NUMERAL] = LAYOUT_split_3x5_3(
|
||||
KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
|
||||
KC_DOT, KC_1, KC_2, KC_3, KC_BSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
KC_DOT, KC_MINS, KC_0, XXXXXXX, _______, XXXXXXX
|
||||
),
|
||||
|
||||
/**
|
||||
* \brief Symbols layer.
|
||||
@ -121,68 +138,12 @@ enum dilemma_keymap_layers {
|
||||
* chording when using mods with shifted symbols. `KC_LPRN` is duplicated next to
|
||||
* `KC_RPRN`.
|
||||
*/
|
||||
#define LAYOUT_LAYER_SYMBOLS \
|
||||
KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, _______________DEAD_HALF_ROW_______________, \
|
||||
KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GACS_R______________, \
|
||||
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, _______________DEAD_HALF_ROW_______________, \
|
||||
[LAYER_SYMBOLS] = LAYOUT_split_3x5_3(
|
||||
KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
|
||||
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
KC_LPRN, KC_GRV, KC_UNDS, _______, XXXXXXX, XXXXXXX
|
||||
|
||||
/**
|
||||
* \brief Add Home Row mod to a layout.
|
||||
*
|
||||
* Expects a 10-key per row layout. Adds support for GACS (Gui, Alt, Ctl, Shift)
|
||||
* home row. The layout passed in parameter must contain at least 20 keycodes.
|
||||
*
|
||||
* This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.:
|
||||
*
|
||||
* HOME_ROW_MOD_GACS(LAYER_ALPHAS_QWERTY)
|
||||
*/
|
||||
#define _HOME_ROW_MOD_GACS( \
|
||||
L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \
|
||||
L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \
|
||||
...) \
|
||||
L00, L01, L02, L03, L04, \
|
||||
R05, R06, R07, R08, R09, \
|
||||
LGUI_T(L10), LALT_T(L11), LCTL_T(L12), LSFT_T(L13), L14, \
|
||||
R15, RSFT_T(R16), RCTL_T(R17), LALT_T(R18), RGUI_T(R19), \
|
||||
__VA_ARGS__
|
||||
#define HOME_ROW_MOD_GACS(...) _HOME_ROW_MOD_GACS(__VA_ARGS__)
|
||||
|
||||
/**
|
||||
* \brief Add pointer layer keys to a layout.
|
||||
*
|
||||
* Expects a 10-key per row layout. The layout passed in parameter must contain
|
||||
* at least 30 keycodes.
|
||||
*
|
||||
* This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.:
|
||||
*
|
||||
* POINTER_MOD(LAYER_ALPHAS_QWERTY)
|
||||
*/
|
||||
#define _POINTER_MOD( \
|
||||
L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \
|
||||
L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \
|
||||
L20, L21, L22, L23, L24, R25, R26, R27, R28, R29, \
|
||||
...) \
|
||||
L00, L01, L02, L03, L04, \
|
||||
R05, R06, R07, R08, R09, \
|
||||
L10, L11, L12, L13, L14, \
|
||||
R15, R16, R17, R18, R19, \
|
||||
_L_PTR(L20), L21, L22, L23, L24, \
|
||||
R25, R26, R27, R28, _L_PTR(R29), \
|
||||
__VA_ARGS__
|
||||
#define POINTER_MOD(...) _POINTER_MOD(__VA_ARGS__)
|
||||
|
||||
#define LAYOUT_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__)
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[LAYER_BASE] = LAYOUT_wrapper(
|
||||
POINTER_MOD(HOME_ROW_MOD_GACS(LAYOUT_LAYER_BASE))
|
||||
),
|
||||
[LAYER_FUNCTION] = LAYOUT_wrapper(LAYOUT_LAYER_FUNCTION),
|
||||
[LAYER_NAVIGATION] = LAYOUT_wrapper(LAYOUT_LAYER_NAVIGATION),
|
||||
[LAYER_NUMERAL] = LAYOUT_wrapper(LAYOUT_LAYER_NUMERAL),
|
||||
[LAYER_POINTER] = LAYOUT_wrapper(LAYOUT_LAYER_POINTER),
|
||||
[LAYER_SYMBOLS] = LAYOUT_wrapper(LAYOUT_LAYER_SYMBOLS),
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user