From e2699773879f17e70e05dd043f2231786c6a61ad Mon Sep 17 00:00:00 2001 From: Adrian Date: Thu, 11 Jun 2020 13:45:53 +0200 Subject: Murcielago: improve default keymap (#9363) * Squashed new default keymap for murcielago --- keyboards/murcielago/rev1/keymaps/default/keymap.c | 105 ++++++++++----------- keyboards/murcielago/rev1/keymaps/via/keymap.c | 105 ++++++++++----------- 2 files changed, 100 insertions(+), 110 deletions(-) diff --git a/keyboards/murcielago/rev1/keymaps/default/keymap.c b/keyboards/murcielago/rev1/keymaps/default/keymap.c index b3abed7631..9837fcff41 100644 --- a/keyboards/murcielago/rev1/keymaps/default/keymap.c +++ b/keyboards/murcielago/rev1/keymaps/default/keymap.c @@ -2,9 +2,9 @@ enum layers { BASE, - _RAISE, - _LOWER, - _POWER + _NAV, + _SYM, + _FN }; #define PRE_WRD LCTL(KC_LEFT) // jump to next word @@ -13,107 +13,102 @@ enum layers { #define NXT_WDL LCTL(KC_DEL) // delete next word #define PRE_WDL LCTL(KC_BSPC) // delete previous word -#define KC_EURO ALGR(KC_5) -#define LA_CAP MT(MOD_LALT, KC_CAPS) // Left alt on hold, caps lock on tap -#define RA_ENT MT(MOD_RALT, KC_ENT) // Right alt on hold, enter on tap - -#define RAISE MO(_RAISE) // Raise layer access -#define LOWER MO(_LOWER) // Lower layer access -#define POWER MO(_POWER) // Power layer access (raise and lower) +#define NAV MO(_NAV) // NAV layer access +#define SYM MO(_SYM) // SYM layer access +#define FN OSL(_FN) // FN layer access /* - * This default keymap is aimed at users of the US international layout + * This default keymap is aimed at users of the US or US international layout */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* BASE * ,-----------------------------------------. ,-----------------------------------------. * | =+ | 1! | 2@ | 3# | 4$ | 5% | | 6^ | 7& | 8* | 9( | 0) | -_ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | [{ | Q | W | E | R | T | | Y | U | I | O | P | }] | + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \| | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Del | A | S | D | F | G | | H | J | K | L | ;: | '" | * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | Sft | Z | X | C | V | B | GEsc | | Tab | N | M | ,< | .> | /? | Sft | + * | Sft | Z | X | C | V | B | Esc | | Ent | N | M | ,< | .> | /? | Sft | * `------------------------------------------------' `------------------------------------------------' - * | LA/CL| LGUI |LOWER | Back | Ctrl | |RA/Ent|Space |RAISE | RGUI | Play | + * | LAlt | LGUI | SYM | Back | Ctrl | | RAlt |Space | NAV | PWR | Play | * `----------------------------------' `----------------------------------' */ [BASE] = LAYOUT( /* qwerty */ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_LBRC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_DEL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GESC, KC_TAB, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - LA_CAP, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, RA_ENT, KC_SPC, RAISE, KC_RGUI, KC_MPLY + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GESC, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LALT, KC_LGUI, SYM, KC_BSPC, KC_LCTL, KC_RALT, KC_SPC, NAV, FN, KC_MPLY ), - /* RAISE + /* NAV - navigation layer * ,-----------------------------------------. ,-----------------------------------------. - * | RST | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ! | @ | # | $ | % | | |PRE W | UP |NXT W | | F12 | + * | | | | | | | | |PRE W | UP |NXT W | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | ( | [ | { | < | | | LEFT | DOWN |RIGHT | | | + * | | | | | | | | HOME | LEFT | DOWN |RIGHT | END | | * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | | ~ | = | + | \ | | | | | |DEL PW| Ins |DEL NW| | | + * | | | | | | | | | | |DEL PW| Ins |DEL NW| | | * `------------------------------------------------' `------------------------------------------------' - * | | |POWER | | | | | | | | | + * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' */ - [_RAISE] = LAYOUT( /* raise layer */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, XXXXXXX, PRE_WRD, KC_UP, NXT_WRD, XXXXXXX, KC_F12, - _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, - _______, KC_TILD, KC_EQL, KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, PRE_WDL, KC_INS, NXT_WDL, XXXXXXX, _______, - _______, _______, POWER, _______, _______, _______, _______, _______, _______, _______ + [_NAV] = LAYOUT( + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, PRE_WRD, KC_UP, NXT_WRD, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, PRE_WDL, KC_INS, NXT_WDL, XXXXXXX, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX ), - /* LOWER + /* SYM - symbols and numpad layer * ,-----------------------------------------. ,-----------------------------------------. - * | RST | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | |PRE W | UP |NXT W | | | ^ | & | * | € | ? | F12 | + * | | | | ( | ) | | | | 7 | 8 | 9 | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | LEFT | DOWN |RIGHT | | | > | } | ] | ) | | | | + * | CLck | | ~ | { | } | | | + | 4 | 5 | 6 | - | | * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | | |DEL PW| Ins |DEL NW| | | | | | / | - | _ | ` | | + * | | | ` | [ | ] | | | | NEnt | * | 1 | 2 | 3 | / | | * `------------------------------------------------' `------------------------------------------------' - * | | | | | | | | |POWER | | | + * | | | | | | | | 0 | | | NLck | * `----------------------------------' `----------------------------------' */ - [_LOWER] = LAYOUT( /* lower layer */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, XXXXXXX, PRE_WRD, KC_UP, NXT_WRD, XXXXXXX, KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12, - _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX, - _______, XXXXXXX, PRE_WDL, KC_INS, NXT_WDL, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV, _______, - _______, _______, _______, _______, _______, _______, _______, POWER, _______, _______ + [_SYM] = LAYOUT( + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + XXXXXXX, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, XXXXXXX, XXXXXXX, + KC_CAPS, XXXXXXX, KC_TILD, KC_LCBR, KC_RCBR, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, XXXXXXX, + XXXXXXX, XXXXXXX, KC_GRV, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PENT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, XXXXXXX, + XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_P0, XXXXXXX, XXXXXXX, KC_NLCK ), - - /* POWER + + /* FN - one-shot access to F-keys with modifiers * ,-----------------------------------------. ,-----------------------------------------. - * | RST | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ! | @ | # | $ | % | | ^ | & | * | € | ? | F12 | + * |A F12 |A F1 |A F2 |A F3 |A F4 |A F5 | | A F6 | A F7 | A F8 | A F9 | A F10| A F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | ( | [ | { | < | | > | } | ] | ) | | | | + * |C F12 |C F1 |C F2 |C F3 |C F4 |C F5 | | C F6 | C F7 | C F8 | C F9 | C F10| C F11| * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | | ~ | = | + | \ | | | | | | / | - | _ | ` | | + * | | | | | | | | | | | | | | | | * `------------------------------------------------' `------------------------------------------------' * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' */ - [_POWER] = LAYOUT( /* lower and raise combined */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12, - _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK, KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX, - _______, KC_TILD, KC_EQL, KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [_FN] = LAYOUT( + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + C(KC_F12), C(KC_F1),C(KC_F2),C(KC_F3),C(KC_F4),C(KC_F5), C(KC_F6),C(KC_F7),C(KC_F8),C(KC_F9),C(KC_F10),C(KC_F11), + A(KC_F12), A(KC_F1),A(KC_F2),A(KC_F3),A(KC_F4),A(KC_F5), A(KC_F6),A(KC_F7),A(KC_F8),A(KC_F9),A(KC_F10),A(KC_F11), + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX ) - }; void encoder_update_user(uint8_t index, bool clockwise) { switch (get_highest_layer(layer_state)) { - case _RAISE: + case _NAV ... _SYM: if (index == 0 || index == 1) { /* Left or right encoder */ // Next/previous track clockwise ? tap_code(KC_MNXT) : tap_code(KC_MPRV); diff --git a/keyboards/murcielago/rev1/keymaps/via/keymap.c b/keyboards/murcielago/rev1/keymaps/via/keymap.c index b3abed7631..9837fcff41 100644 --- a/keyboards/murcielago/rev1/keymaps/via/keymap.c +++ b/keyboards/murcielago/rev1/keymaps/via/keymap.c @@ -2,9 +2,9 @@ enum layers { BASE, - _RAISE, - _LOWER, - _POWER + _NAV, + _SYM, + _FN }; #define PRE_WRD LCTL(KC_LEFT) // jump to next word @@ -13,107 +13,102 @@ enum layers { #define NXT_WDL LCTL(KC_DEL) // delete next word #define PRE_WDL LCTL(KC_BSPC) // delete previous word -#define KC_EURO ALGR(KC_5) -#define LA_CAP MT(MOD_LALT, KC_CAPS) // Left alt on hold, caps lock on tap -#define RA_ENT MT(MOD_RALT, KC_ENT) // Right alt on hold, enter on tap - -#define RAISE MO(_RAISE) // Raise layer access -#define LOWER MO(_LOWER) // Lower layer access -#define POWER MO(_POWER) // Power layer access (raise and lower) +#define NAV MO(_NAV) // NAV layer access +#define SYM MO(_SYM) // SYM layer access +#define FN OSL(_FN) // FN layer access /* - * This default keymap is aimed at users of the US international layout + * This default keymap is aimed at users of the US or US international layout */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* BASE * ,-----------------------------------------. ,-----------------------------------------. * | =+ | 1! | 2@ | 3# | 4$ | 5% | | 6^ | 7& | 8* | 9( | 0) | -_ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | [{ | Q | W | E | R | T | | Y | U | I | O | P | }] | + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \| | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Del | A | S | D | F | G | | H | J | K | L | ;: | '" | * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | Sft | Z | X | C | V | B | GEsc | | Tab | N | M | ,< | .> | /? | Sft | + * | Sft | Z | X | C | V | B | Esc | | Ent | N | M | ,< | .> | /? | Sft | * `------------------------------------------------' `------------------------------------------------' - * | LA/CL| LGUI |LOWER | Back | Ctrl | |RA/Ent|Space |RAISE | RGUI | Play | + * | LAlt | LGUI | SYM | Back | Ctrl | | RAlt |Space | NAV | PWR | Play | * `----------------------------------' `----------------------------------' */ [BASE] = LAYOUT( /* qwerty */ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_LBRC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_DEL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GESC, KC_TAB, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - LA_CAP, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, RA_ENT, KC_SPC, RAISE, KC_RGUI, KC_MPLY + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GESC, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LALT, KC_LGUI, SYM, KC_BSPC, KC_LCTL, KC_RALT, KC_SPC, NAV, FN, KC_MPLY ), - /* RAISE + /* NAV - navigation layer * ,-----------------------------------------. ,-----------------------------------------. - * | RST | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ! | @ | # | $ | % | | |PRE W | UP |NXT W | | F12 | + * | | | | | | | | |PRE W | UP |NXT W | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | ( | [ | { | < | | | LEFT | DOWN |RIGHT | | | + * | | | | | | | | HOME | LEFT | DOWN |RIGHT | END | | * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | | ~ | = | + | \ | | | | | |DEL PW| Ins |DEL NW| | | + * | | | | | | | | | | |DEL PW| Ins |DEL NW| | | * `------------------------------------------------' `------------------------------------------------' - * | | |POWER | | | | | | | | | + * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' */ - [_RAISE] = LAYOUT( /* raise layer */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, XXXXXXX, PRE_WRD, KC_UP, NXT_WRD, XXXXXXX, KC_F12, - _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, - _______, KC_TILD, KC_EQL, KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, PRE_WDL, KC_INS, NXT_WDL, XXXXXXX, _______, - _______, _______, POWER, _______, _______, _______, _______, _______, _______, _______ + [_NAV] = LAYOUT( + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, PRE_WRD, KC_UP, NXT_WRD, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, PRE_WDL, KC_INS, NXT_WDL, XXXXXXX, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX ), - /* LOWER + /* SYM - symbols and numpad layer * ,-----------------------------------------. ,-----------------------------------------. - * | RST | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | |PRE W | UP |NXT W | | | ^ | & | * | € | ? | F12 | + * | | | | ( | ) | | | | 7 | 8 | 9 | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | LEFT | DOWN |RIGHT | | | > | } | ] | ) | | | | + * | CLck | | ~ | { | } | | | + | 4 | 5 | 6 | - | | * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | | |DEL PW| Ins |DEL NW| | | | | | / | - | _ | ` | | + * | | | ` | [ | ] | | | | NEnt | * | 1 | 2 | 3 | / | | * `------------------------------------------------' `------------------------------------------------' - * | | | | | | | | |POWER | | | + * | | | | | | | | 0 | | | NLck | * `----------------------------------' `----------------------------------' */ - [_LOWER] = LAYOUT( /* lower layer */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, XXXXXXX, PRE_WRD, KC_UP, NXT_WRD, XXXXXXX, KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12, - _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX, - _______, XXXXXXX, PRE_WDL, KC_INS, NXT_WDL, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV, _______, - _______, _______, _______, _______, _______, _______, _______, POWER, _______, _______ + [_SYM] = LAYOUT( + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + XXXXXXX, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, XXXXXXX, XXXXXXX, + KC_CAPS, XXXXXXX, KC_TILD, KC_LCBR, KC_RCBR, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, XXXXXXX, + XXXXXXX, XXXXXXX, KC_GRV, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PENT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, XXXXXXX, + XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_P0, XXXXXXX, XXXXXXX, KC_NLCK ), - - /* POWER + + /* FN - one-shot access to F-keys with modifiers * ,-----------------------------------------. ,-----------------------------------------. - * | RST | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ! | @ | # | $ | % | | ^ | & | * | € | ? | F12 | + * |A F12 |A F1 |A F2 |A F3 |A F4 |A F5 | | A F6 | A F7 | A F8 | A F9 | A F10| A F11| * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | ( | [ | { | < | | > | } | ] | ) | | | | + * |C F12 |C F1 |C F2 |C F3 |C F4 |C F5 | | C F6 | C F7 | C F8 | C F9 | C F10| C F11| * |------+------+------+------+------+------+------. ,------+------+------+------+------+------+------| - * | | ~ | = | + | \ | | | | | | / | - | _ | ` | | + * | | | | | | | | | | | | | | | | * `------------------------------------------------' `------------------------------------------------' * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' */ - [_POWER] = LAYOUT( /* lower and raise combined */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EURO, KC_QUES, KC_F12, - _______, KC_PIPE, KC_LPRN, KC_LBRC, KC_LCBR, KC_LABK, KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE, XXXXXXX, - _______, KC_TILD, KC_EQL, KC_PLUS, KC_BSLS, XXXXXXX, _______, _______, XXXXXXX, KC_SLSH, KC_MINS, KC_UNDS, KC_GRV, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [_FN] = LAYOUT( + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + C(KC_F12), C(KC_F1),C(KC_F2),C(KC_F3),C(KC_F4),C(KC_F5), C(KC_F6),C(KC_F7),C(KC_F8),C(KC_F9),C(KC_F10),C(KC_F11), + A(KC_F12), A(KC_F1),A(KC_F2),A(KC_F3),A(KC_F4),A(KC_F5), A(KC_F6),A(KC_F7),A(KC_F8),A(KC_F9),A(KC_F10),A(KC_F11), + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX ) - }; void encoder_update_user(uint8_t index, bool clockwise) { switch (get_highest_layer(layer_state)) { - case _RAISE: + case _NAV ... _SYM: if (index == 0 || index == 1) { /* Left or right encoder */ // Next/previous track clockwise ? tap_code(KC_MNXT) : tap_code(KC_MPRV); -- cgit v1.2.3