Author: Honza Pokorny <me@honza.ca>
Merge branch 'corne-keyboard'
ergodox/keymap.c | 76 +++++++++++++++++++++++--------------------------
diff --git a/ergodox/keymap.c b/ergodox/keymap.c index 9fba4ead820e80bc608505dba4d43e423fb4979d..c11ff7f81be9b919932275d951f57c03cd6e0d26 100644 --- a/ergodox/keymap.c +++ b/ergodox/keymap.c @@ -1,6 +1,6 @@ /* * ergodox ez keymap - * Copyright (C) 2019, Honza Pokorny <me@honza.ca> + * Copyright (C) 2019-2021, Honza Pokorny <me@honza.ca> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,6 @@ // This is the default dvorak layout file // I expect to customize this heavily. #include QMK_KEYBOARD_H -#include "debug.h" -#include "action_layer.h" - -#define BASE 0 // default layer -#define SYMB 1 // symbols -#define MDIA 2 // media keys enum custom_keycodes { IF_ERR_NIL = EZ_SAFE_RANGE, @@ -36,45 +30,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ | + * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | Del | ' | , | . | P | Y | if | | L1 | F | G | C | R | L | / | + * | Tab | ' | , | . | P | Y | if | | L1 | F | G | C | R | L | bkspc | * |--------+------+------+------+------+------| err | | |------+------+------+------+------+--------| - * | | A | O | E | U | I |------| |------| D | H | T | N | S | - | + * |ctrl/esc| A | O | E | U | I |------| |------| D | H | T | N | S | - | * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| * | LS + ( | : | Q | J | K | X | | | | B | M | W | V | Z | RS + ) | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |Grv/L1| '" |AltShf| Left | bkspc| | Space| Down | [ | ] | ~L1 | + * | | | | LGUI | L1 | | L2 | Alt | | | | * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | App | LGui | | Alt |Ctrl/Esc| + * ,-------------. ,---------------. + * | | | | | | * ,------|------|------| |------+--------+------. - * | | | Home | | PgUp | | | - * | Ctrl | Esc |------| |------| L1 |Enter | - * | | | End | | PgDn | | | + * | | | | | | | | + * | Space| |------| |------| |Enter | + * | | | | | | | | * `--------------------' `----------------------' */ // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* -[BASE] = LAYOUT_ergodox( // layer 0 : default +[0] = LAYOUT_ergodox( // layer 0 : default // left hand - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, - KC_DELT, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, IF_ERR_NIL, - KC_TRNS, KC_A, KC_O, KC_E, KC_U, KC_I, - KC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, ALL_T(KC_NO), - MO(MDIA) ,KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_BSPC, - ALT_T(KC_APP), KC_LGUI, - KC_HOME, - KC_LCTL,KC_ESC,KC_END, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, IF_ERR_NIL, + LCTL_T(KC_ESC), KC_A, KC_O, KC_E, KC_U, KC_I, + KC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, ALL_T(KC_NO), + KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, MO(1), + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_SPC,KC_TRNS,KC_TRNS, // right hand - KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - TG(1), KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, - KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, - MEH_T(KC_NO),KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSPC, - KC_SPC, KC_DOWN,KC_LBRC,KC_RBRC, TT(SYMB), - KC_LALT, CTL_T(KC_ESC), - KC_PGUP, - KC_PGDN,MO(SYMB), KC_ENT + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + TG(1), KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, + KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + MEH_T(KC_NO),KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSPC, + MO(2), KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_ENT ), /* Keymap 1: Symbol Layer * @@ -83,9 +77,9 @@ * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | ! | @ | { | } | | | | | | | 7 | 8 | 9 | * | F12 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | # | $ | ( | ) | ` |------| |------| | 4 | 5 | 6 | + | | + * | | # | $ | [ | ] | ` |------| |------| | 4 | 5 | 6 | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * | | % | ^ | ? | / | ~ | | | | & | 1 | 2 | 3 | \ | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | | . | 0 | = | | * `----------------------------------' `----------------------------------' @@ -98,12 +92,12 @@ * | | | | | | | | * `--------------------' `--------------------' */ // SYMBOLS -[SYMB] = LAYOUT_ergodox( +[1] = LAYOUT_ergodox( // left hand - KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, - KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, - KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, - KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, + KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR, KC_PIPE,KC_TRNS, + KC_TRNS,KC_HASH,KC_DLR, KC_LBRC,KC_RBRC, KC_GRV, + KC_TRNS,KC_PERC,KC_CIRC,KC_QUES,KC_SLASH,KC_TILD,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, @@ -140,7 +134,7 @@ * | | | | | | | | * `--------------------' `--------------------' */ // MEDIA AND MOUSE -[MDIA] = LAYOUT_ergodox( +[2] = LAYOUT_ergodox( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,