diff options
| author | Fredric Silberberg <fred@silberberg.xyz> | 2018-10-30 01:09:22 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-12-13 10:24:20 -0800 |
| commit | e8f730595c37a508ad86cc46fa39c7fae4d36800 (patch) | |
| tree | 2079e118db3c925f6c35187b68d9b8acae190413 | |
| parent | cc45f62d757f56c2fa9be92685f83f127b63b509 (diff) | |
| download | qmk_firmware-e8f730595c37a508ad86cc46fa39c7fae4d36800.tar.gz qmk_firmware-e8f730595c37a508ad86cc46fa39c7fae4d36800.zip | |
Dactyl_manuform map and updates to my ergodox layout for moving to a
different location.
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h | 9 | ||||
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c | 80 | ||||
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk | 7 | ||||
| -rw-r--r-- | layouts/community/ergodox/333fred/keymap.c | 350 | ||||
| -rw-r--r-- | layouts/community/ergodox/333fred/visualizer.c | 14 | ||||
| -rw-r--r-- | users/333fred/333fred.h | 11 |
6 files changed, 269 insertions, 202 deletions
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h new file mode 100644 index 000000000..10b969326 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | #pragma once | ||
| 2 | |||
| 3 | #include "333fred_config.h" | ||
| 4 | |||
| 5 | #define USE_SERIAL | ||
| 6 | #define EE_HANDS | ||
| 7 | |||
| 8 | #undef TAPPING_TERM | ||
| 9 | #define TAPPING_TERM 200 | ||
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c new file mode 100644 index 000000000..c37009f24 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/keymap.c | |||
| @@ -0,0 +1,80 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | #include "333fred.h" | ||
| 3 | |||
| 4 | enum custom_macros { | ||
| 5 | DLEFT, | ||
| 6 | DRIGHT, | ||
| 7 | PSCREEN_APP | ||
| 8 | }; | ||
| 9 | |||
| 10 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 11 | |||
| 12 | [BASE] = LAYOUT_5x6( | ||
| 13 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | ||
| 14 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | ||
| 15 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | ||
| 16 | OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), | ||
| 17 | KC_F4, KC_F5, TG(CODEFLOW), KC_EQL, | ||
| 18 | KC_LALT, KC_BSPC, KC_SPC, OSL(VIM), | ||
| 19 | KC_TAB, TD(TD_SYM_VIM), KC_ENT, KC_RGUI, | ||
| 20 | KC_LCTL, KC_DEL, KC_UP, KC_DOWN | ||
| 21 | ), | ||
| 22 | |||
| 23 | [CODEFLOW] = LAYOUT_5x6( | ||
| 24 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 25 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 26 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 27 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 28 | KC_F7, KC_F8, _______, _______, | ||
| 29 | _______, _______, _______, _______, | ||
| 30 | _______, _______, _______, _______, | ||
| 31 | _______, _______, _______, _______ | ||
| 32 | ), | ||
| 33 | |||
| 34 | [SYMB] = LAYOUT_5x6( | ||
| 35 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | ||
| 36 | _______, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, _______, KC_7, KC_8, KC_9, _______, KC_F12, | ||
| 37 | _______, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, _______, KC_4, KC_5, KC_6, _______, _______, | ||
| 38 | _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, KC_1, KC_2, KC_3, _______, _______, | ||
| 39 | KC_F7, KC_F8, KC_0, KC_ENT, | ||
| 40 | _______, _______, KC_MPLY, KC_MNXT, | ||
| 41 | _______, _______, KC_MPRV, _______, | ||
| 42 | _______, _______, KC_VOLU, KC_VOLD | ||
| 43 | ), | ||
| 44 | |||
| 45 | [VIM] = LAYOUT_5x6( | ||
| 46 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, | ||
| 47 | _______, _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, | ||
| 48 | _______, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, | ||
| 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 50 | _______, _______, _______, _______, | ||
| 51 | _______, _______, _______, _______, | ||
| 52 | _______, _______, _______, _______, | ||
| 53 | _______, _______, _______, _______ | ||
| 54 | ), | ||
| 55 | }; | ||
| 56 | |||
| 57 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 58 | switch(id) { | ||
| 59 | case DLEFT: | ||
| 60 | if (record->event.pressed) { // Windows move desktop left | ||
| 61 | return MACRO(D(LCTL), D(LGUI), T(LEFT), U(LGUI), U(LCTL), END); | ||
| 62 | } | ||
| 63 | break; | ||
| 64 | case DRIGHT: | ||
| 65 | if (record->event.pressed) { // Windows move desktop right | ||
| 66 | return MACRO(D(LCTL), D(LGUI), T(RIGHT), U(LGUI), U(LCTL), END); | ||
| 67 | } | ||
| 68 | break; | ||
| 69 | case PSCREEN_APP: if (record->event.pressed) { | ||
| 70 | return MACRO(D(LALT), T(PSCR), U(LALT), END); | ||
| 71 | } | ||
| 72 | break; | ||
| 73 | } | ||
| 74 | return MACRO_NONE; | ||
| 75 | } | ||
| 76 | |||
| 77 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 78 | tap_dance_process_record(keycode); | ||
| 79 | return true; | ||
| 80 | } | ||
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk new file mode 100644 index 000000000..79ef33e7c --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | |||
| 2 | NKRO_ENABLE = yes | ||
| 3 | KEY_LOCK_ENABLE = yes | ||
| 4 | TAP_DANCE_ENABLE = yes | ||
| 5 | CONSOLE_ENABLE = no | ||
| 6 | PERMISSIVE_HOLD = yes | ||
| 7 | EXTRAFLAGS += -flto | ||
diff --git a/layouts/community/ergodox/333fred/keymap.c b/layouts/community/ergodox/333fred/keymap.c index d7728a5bd..b203f42c6 100644 --- a/layouts/community/ergodox/333fred/keymap.c +++ b/layouts/community/ergodox/333fred/keymap.c | |||
| @@ -11,28 +11,19 @@ enum custom_keycodes { | |||
| 11 | }; | 11 | }; |
| 12 | 12 | ||
| 13 | enum custom_macros { | 13 | enum custom_macros { |
| 14 | VERSION, | ||
| 15 | EEPROM, | ||
| 16 | |||
| 17 | // Windows macros | 14 | // Windows macros |
| 18 | DLEFT, | 15 | DLEFT, |
| 19 | DRIGHT, | 16 | DRIGHT, |
| 20 | PSCREEN_APP, | 17 | PSCREEN_APP, |
| 21 | LSFT_TAB, | 18 | LSFT_TAB, |
| 22 | 19 | ||
| 23 | // VS Macros | ||
| 24 | REFACTOR, | ||
| 25 | TEST, | ||
| 26 | DEBUG_TEST, | ||
| 27 | FORMAT, | ||
| 28 | BUILD, | ||
| 29 | GO_TO_IMPL, | ||
| 30 | FIND_ALL_REF, | ||
| 31 | REMOVE_SORT_USINGS, | ||
| 32 | |||
| 33 | // KeePass macros | 20 | // KeePass macros |
| 34 | KEEPASS_OPEN, | 21 | KEEPASS_OPEN, |
| 35 | KEEPASS_TYPE, | 22 | KEEPASS_TYPE, |
| 23 | |||
| 24 | // Terminal Copy/Paste | ||
| 25 | TERM_CP, | ||
| 26 | TERM_PT | ||
| 36 | }; | 27 | }; |
| 37 | 28 | ||
| 38 | // NOTE: Cells marked with ACCESS must remain transparent, they're the keys that actually get to that layer | 29 | // NOTE: Cells marked with ACCESS must remain transparent, they're the keys that actually get to that layer |
| @@ -41,131 +32,111 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 41 | /* Keymap 0: Basic layer | 32 | /* Keymap 0: Basic layer |
| 42 | * | 33 | * |
| 43 | * ,--------------------------------------------------. ,--------------------------------------------------. | 34 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 44 | * | ` | 1 | 2 | 3 | 4 | 5 | = | | L1 | 6 | 7 | 8 | 9 | 0 | - | | 35 | * | ` | 1 | 2 | 3 | 4 | 5 | F5 | | F6 | 6 | 7 | 8 | 9 | 0 | - | |
| 45 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 36 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 46 | * | TAB | Q | W | E | R | T | L1 | | L2 | Y | U | I | O | P | \ | | 37 | * | TAB | Q | W | E | R | T | GAME | |GAMEA | Y | U | I | O | P | \ | |
| 47 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 38 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 48 | * | Esc | A | S | D | F | G |------| |------| H | J | K | L | ; | ' | | 39 | * | Esc | A | S | D | F | G |------| |------| H | J | K | L | ; | ' | |
| 49 | * |--------+------+------+------+------+------| L2 | |MO(3) |------+------+------+------+------+--------| | 40 | * |--------+------+------+------+------+------| SYMB | |MEDIA |------+------+------+------+------+--------| |
| 50 | * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | | 41 | * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | |
| 51 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 42 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 52 | * |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI | | 43 | * |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | = | Right| RGUI | |
| 53 | * `----------------------------------' `----------------------------------' | 44 | * `----------------------------------' `----------------------------------' |
| 54 | * ,-------------. ,-------------. | 45 | * ,-------------. ,-------------. |
| 55 | * | Copy | Paste| | Copy | Paste | | 46 | * | Copy | Paste| | Copy | Paste | |
| 56 | * ,------|------|------| |------+--------+------. | 47 | * ,------|------|------| |------+--------+------. |
| 57 | * | | | PgUp | | PgDn | | | | 48 | * | | | PgUp | | Up | | | |
| 58 | * | Bcksp|OSL(2)|------| |------| Ent |Space | | 49 | * | Bcksp|OSL(2)|------| |------| Ent |Space | |
| 59 | * | | VIM | Del | | RCtrl| | | | 50 | * | | VIM | Del | | Down | | | |
| 60 | * `--------------------' `----------------------' | 51 | * `--------------------' `----------------------' |
| 61 | */ | 52 | */ |
| 62 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. | 53 | [BASE] = LAYOUT_ergodox_pretty( // layer 0 : default |
| 63 | // Otherwise, it needs KC_* | ||
| 64 | [BASE] = LAYOUT_ergodox( // layer 0 : default | ||
| 65 | // left hand | 54 | // left hand |
| 66 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, | 55 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F5, KC_F6, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, |
| 67 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(CODE), | 56 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(GAME), TG(GAME_ARROW), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, |
| 68 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, | 57 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
| 69 | OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(SYMB), | 58 | OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(SYMB), MO(MDIA), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), OSM(MOD_RSFT), |
| 70 | OSM(MOD_LCTL), KC_F4, KC_F5, KC_LGUI,KC_LALT, | 59 | OSM(MOD_LCTL), KC_F4, KC_F5, KC_LGUI, KC_LALT, KC_LEFT, KC_DOWN, KC_EQL, KC_RIGHT, KC_RGUI, |
| 71 | LCTL(KC_C), LCTL(KC_V), | 60 | LCTL(KC_C), LCTL(KC_V), LCTL(KC_C), LCTL(KC_V), |
| 72 | KC_PGUP, | 61 | KC_PGUP, KC_UP, |
| 73 | KC_BSPC,TD(TD_SYM_VIM), KC_DEL, | 62 | KC_BSPC, TD(TD_SYM_VIM), KC_DEL, KC_DOWN, KC_ENT, KC_SPC |
| 74 | // right hand | ||
| 75 | TG(CODE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | ||
| 76 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | ||
| 77 | KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | ||
| 78 | MO(MDIA), KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), OSM(MOD_RSFT), | ||
| 79 | KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, KC_RGUI, | ||
| 80 | LCTL(KC_C), LCTL(KC_V), | ||
| 81 | KC_PGDN, | ||
| 82 | KC_RCTL, KC_ENT, KC_SPC | ||
| 83 | ), | 63 | ), |
| 84 | /* Keymap 1: Code Layer | 64 | |
| 65 | /* Keymap 2: Codeflow Layer | ||
| 85 | * | 66 | * |
| 86 | * ,--------------------------------------------------. ,--------------------------------------------------. | 67 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 87 | * | | | | | | | | |ACCESS| | | | | | | | 68 | * | | | | | | | | | | | | | | | | |
| 88 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 69 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 89 | * | | | | | | | F10 | | F11 | | | | | | | | 70 | * | | | | | | | | | | | | | | | | |
| 90 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 71 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 91 | * | | | | | | |------| |------| | | | | | | | 72 | * | | | | | | |------| |------| | | | | | | |
| 92 | * |--------+------+------+------+------+------| L2 | | |------+------+------+------+------+--------| | 73 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 93 | * | | | | | | | | | | | | | | | | | 74 | * | | | | | | | | | | | | | | | | |
| 94 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 75 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 95 | * | | | | | | | F12 |GoToIm| FAR | | | | 76 | * | | | | | | | F7 | F8 | | | | |
| 96 | * `----------------------------------' `----------------------------------' | 77 | * `----------------------------------' `----------------------------------' |
| 97 | * ,-------------. ,---------------. | 78 | * ,-------------. ,---------------. |
| 98 | * |Format|Build | | Copy | Paste | | 79 | * | |ACCESS| | | | |
| 99 | * ,------|------|------| |------+--------+------. | 80 | * ,------|------|------| |------+--------+------. |
| 100 | * | | |Refact| | Up | | | | 81 | * | | | | | | | | |
| 101 | * | |ACCESS|------| |------| | | | 82 | * | | |------| |------| | | |
| 102 | * | | | | | Down | | | | 83 | * | | | | | | | | |
| 103 | * `--------------------' `----------------------' | 84 | * `--------------------' `----------------------' |
| 104 | */ | 85 | */ |
| 105 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. | 86 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. |
| 106 | // Otherwise, it needs KC_* | 87 | // Otherwise, it needs KC_* |
| 107 | [CODE] = LAYOUT_ergodox( // layer 1 : code | 88 | [CODEFLOW] = LAYOUT_ergodox( // layer 1 : code |
| 108 | // left hand | 89 | // left hand |
| 109 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 90 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 110 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F10, | 91 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 111 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 92 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 112 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(SYMB), | 93 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 113 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 94 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 114 | M(FORMAT),M(BUILD), | 95 | KC_TRNS, KC_TRNS, |
| 115 | M(REFACTOR), | 96 | KC_TRNS, |
| 116 | KC_TRNS, KC_TRNS, KC_TRNS, | 97 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 117 | // right hand | 98 | // right han |
| 118 | 99 | ||
| 119 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 100 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 120 | KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 101 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 121 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 102 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 122 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 103 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 123 | KC_F12, M(GO_TO_IMPL),M(FIND_ALL_REF),KC_TRNS, KC_TRNS, | 104 | KC_F7, KC_F8, KC_TRNS, KC_TRNS, KC_TRNS, |
| 124 | LCTL(KC_C), LCTL(KC_V), | 105 | KC_TRNS, KC_TRNS, |
| 125 | KC_UP, | 106 | KC_TRNS, |
| 126 | KC_DOWN, KC_TRNS, KC_TRNS | 107 | KC_TRNS, KC_TRNS, KC_TRNS |
| 127 | ), | 108 | ), |
| 128 | /* Keymap 2: Symbol Layer | 109 | /* Keymap 3: Symbol Layer |
| 129 | * | 110 | * |
| 130 | * ,---------------------------------------------------. ,--------------------------------------------------. | 111 | * ,---------------------------------------------------. ,--------------------------------------------------. |
| 131 | * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | | 112 | * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | |
| 132 | * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| | 113 | * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| |
| 133 | * | | ! | @ | ( | ) | | |ACCESS| |ACCESS| Up | 7 | 8 | 9 | * | F12 | | 114 | * | | ! | @ | ( | ) | | | | | | Up | 7 | 8 | 9 | * | F12 | |
| 134 | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 115 | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 135 | * | | # | $ | { | } | ` |------| |------| Down | 4 | 5 | 6 | + | | | 116 | * | | # | $ | { | } | ` |------| |------| Down | 4 | 5 | 6 | + | | |
| 136 | * |---------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------| | 117 | * |---------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------| |
| 137 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | | 118 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | |
| 138 | * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 119 | * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 139 | * | EPRM | | | | | | 0 | 0 | . | = | | | 120 | * | | | | | | | 0 | 0 | . | = | | |
| 140 | * `-----------------------------------' `----------------------------------' | 121 | * `-----------------------------------' `----------------------------------' |
| 141 | * ,-------------. ,-------------. | 122 | * ,-------------. ,-------------. |
| 142 | * | | Caps | | | | | 123 | * | | | | | | |
| 143 | * ,------|------|------| |------+------+------. | 124 | * ,------|------|------| |------+------+------. |
| 144 | * | | |APScr | | | | | | 125 | * | | |APScr | | | | | |
| 145 | * | |ACCESS|------| |------| | | | 126 | * | |ACCESS|------| |------| | | |
| 146 | * | | | PScr | |ACCESS| | | | 127 | * | | | PScr | | | | | |
| 147 | * `--------------------' `--------------------' | 128 | * `--------------------' `--------------------' |
| 148 | */ | 129 | */ |
| 149 | // SYMBOLS | 130 | [SYMB] = LAYOUT_ergodox_pretty( |
| 150 | [SYMB] = LAYOUT_ergodox( | ||
| 151 | // left hand | 131 | // left hand |
| 152 | VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, | 132 | KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 153 | KC_TRNS,KC_EXLM,KC_AT, KC_LPRN,KC_RPRN,KC_PIPE,KC_TRNS, | 133 | KC_TRNS, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, |
| 154 | KC_TRNS,KC_HASH,KC_DLR, KC_LCBR,KC_RCBR,KC_GRV, | 134 | KC_TRNS, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, |
| 155 | KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, | 135 | KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, |
| 156 | EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, | 136 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_0, KC_DOT, KC_EQL, KC_TRNS, |
| 157 | KC_TRNS,KC_CAPS, | 137 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 158 | M(PSCREEN_APP), | 138 | M(PSCREEN_APP), KC_TRNS, |
| 159 | KC_TRNS,KC_TRNS,KC_PSCR, | 139 | KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS |
| 160 | // right hand | ||
| 161 | KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | ||
| 162 | KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, | ||
| 163 | KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, | ||
| 164 | KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, | ||
| 165 | KC_0, KC_0, KC_DOT, KC_EQL, KC_TRNS, | ||
| 166 | KC_TRNS, KC_TRNS, | ||
| 167 | KC_TRNS, | ||
| 168 | KC_TRNS, KC_TRNS, KC_TRNS | ||
| 169 | ), | 140 | ), |
| 170 | /* Keymap 3: Media and mouse keys | 141 | /* Keymap 3: Media and mouse keys |
| 171 | * | 142 | * |
| @@ -188,32 +159,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 188 | * | | | | | Back | | | | 159 | * | | | | | Back | | | |
| 189 | * `--------------------' `--------------------' | 160 | * `--------------------' `--------------------' |
| 190 | */ | 161 | */ |
| 191 | // MEDIA AND MOUSE | 162 | [MDIA] = LAYOUT_ergodox_pretty( |
| 192 | [MDIA] = LAYOUT_ergodox( | 163 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 193 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 164 | KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 194 | KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, | 165 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 195 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, | 166 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 196 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 167 | KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 197 | KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, | 168 | BL_INC, BL_DEC, KC_VOLU, KC_TRNS, |
| 198 | BL_INC, BL_DEC, | 169 | BL_TOGG, KC_VOLD, |
| 199 | BL_TOGG, | 170 | KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT |
| 200 | KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 201 | // right hand | ||
| 202 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 203 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 204 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 205 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 206 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 207 | KC_VOLU, KC_TRNS, | ||
| 208 | KC_VOLD, | ||
| 209 | KC_MPRV, KC_MPLY, KC_MNXT | ||
| 210 | ), | 171 | ), |
| 211 | /* Keymap 4: Movement | 172 | /* Keymap 4: Movement |
| 212 | * | 173 | * |
| 213 | * ,--------------------------------------------------. ,--------------------------------------------------. | 174 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 214 | * | | | | | | | | | | | | | | | | | 175 | * | | | | | | | | | | | | | | | | |
| 215 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 176 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 216 | * | |KOpen |KType |LSHFT | | | | | | Copy | | | | Paste| | | 177 | * | |KOpen |KType |TERMCP|TERMPT| | | | | Copy | | | | Paste| | |
| 217 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 178 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 218 | * | |DLeft |DRight|LCTRL | LGUI | |------| |------| Left | Down | Up | Right| | | | 179 | * | |DLeft |DRight|LCTRL | LGUI | |------| |------| Left | Down | Up | Right| | | |
| 219 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 180 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| @@ -230,26 +191,84 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 230 | * `--------------------' `--------------------' | 191 | * `--------------------' `--------------------' |
| 231 | */ | 192 | */ |
| 232 | // MEDIA AND MOUSE | 193 | // MEDIA AND MOUSE |
| 233 | [VIM] = LAYOUT_ergodox( | 194 | [VIM] = LAYOUT_ergodox_pretty( |
| 234 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 195 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 235 | KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, | 196 | KC_TRNS, M(KEEPASS_OPEN), M(KEEPASS_TYPE), TERM_CP, TERM_PT, KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_C), KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_V), KC_TRNS, |
| 236 | KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, KC_TRNS, | 197 | KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, |
| 237 | KC_TRNS, M(LSFT_TAB), KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 198 | KC_TRNS, M(LSFT_TAB), KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 238 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 199 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 239 | KC_TRNS, KC_TRNS, | 200 | KC_TRNS, KC_TRNS, KC_HOME, KC_END, |
| 240 | KC_TRNS, | 201 | KC_TRNS, KC_TRNS, |
| 241 | KC_TRNS, KC_TRNS, KC_TRNS, | 202 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 242 | // right hand | 203 | ), |
| 243 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 204 | /* Keymap 1: Game Layer |
| 244 | KC_TRNS, LCTL(KC_C),KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_V),KC_TRNS, | 205 | * |
| 245 | KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_TRNS, KC_TRNS, | 206 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 246 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 207 | * | ESC | | | | | | | | | | | | | | | |
| 247 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 208 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 248 | KC_HOME, KC_END, | 209 | * | | | | | | |ACCESS| | | | | | | | | |
| 249 | KC_TRNS, | 210 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 250 | KC_TRNS, KC_TRNS, KC_TRNS | 211 | * | CTRL | | | | | |------| |------| | | | | | | |
| 251 | 212 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | |
| 252 | ) | 213 | * | SHIFT | Z | | | | | | | | | | | | | | |
| 214 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 215 | * |ENTER | | | LOCK | BSPC | | | | | | | | ||
| 216 | * `----------------------------------' `----------------------------------' | ||
| 217 | * ,-------------. ,---------------. | ||
| 218 | * | F5 | F6 | | | | | ||
| 219 | * ,------|------|------| |------+--------+------. | ||
| 220 | * | | | | | | | | | ||
| 221 | * | ALT | SPC |------| |------| | | | ||
| 222 | * | | | SYMB | | | | | | ||
| 223 | * `--------------------' `----------------------' | ||
| 224 | */ | ||
| 225 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. | ||
| 226 | // Otherwise, it needs KC_* | ||
| 227 | [GAME] = LAYOUT_ergodox_pretty( // layer 1 : code | ||
| 228 | // left hand | ||
| 229 | KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 230 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 231 | KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 232 | KC_LSFT, KC_Z, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 233 | KC_ENT, KC_TRNS, KC_TRNS, KC_LOCK, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 234 | KC_F5, KC_F6, LCTL(KC_C), LCTL(KC_V), | ||
| 235 | KC_TRNS, KC_UP, | ||
| 236 | KC_LALT, KC_SPC, OSM(SYMB), KC_DOWN, KC_TRNS, KC_TRNS | ||
| 237 | ), | ||
| 238 | /* Keymap 1: Game Arrow Layer | ||
| 239 | * | ||
| 240 | * ,--------------------------------------------------. ,--------------------------------------------------. | ||
| 241 | * | ESC | | | | | | | | | | | | | | | | ||
| 242 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | ||
| 243 | * | | | Up | | | | | |ACCESS| | | | | | | | ||
| 244 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 245 | * | CTRL | Left | Down |Right | | |------| |------| | | | | | | | ||
| 246 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 247 | * | SHIFT | Z | | | | | | | | | | | | | | | ||
| 248 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 249 | * |ENTER | | | LOCK | BSPC | | | | | | | | ||
| 250 | * `----------------------------------' `----------------------------------' | ||
| 251 | * ,-------------. ,---------------. | ||
| 252 | * | F5 | F6 | | | | | ||
| 253 | * ,------|------|------| |------+--------+------. | ||
| 254 | * | | | | | | | | | ||
| 255 | * | ALT | SPC |------| |------| | | | ||
| 256 | * | | | SYMB | | | | | | ||
| 257 | * `--------------------' `----------------------' | ||
| 258 | */ | ||
| 259 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. | ||
| 260 | // Otherwise, it needs KC_* | ||
| 261 | [GAME_ARROW] = LAYOUT_ergodox_pretty( // layer 1 : code | ||
| 262 | // left hand | ||
| 263 | KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 264 | KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 265 | KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 266 | KC_LSFT, KC_Z, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 267 | KC_ENT, KC_TRNS, KC_TRNS, KC_LOCK, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 268 | KC_F5, KC_F6, LCTL(KC_C), LCTL(KC_V), | ||
| 269 | KC_TRNS, KC_UP, | ||
| 270 | KC_LALT, KC_SPC, OSM(SYMB), KC_DOWN, KC_TRNS, KC_TRNS | ||
| 271 | ) | ||
| 253 | }; | 272 | }; |
| 254 | 273 | ||
| 255 | const uint16_t PROGMEM fn_actions[] = { | 274 | const uint16_t PROGMEM fn_actions[] = { |
| @@ -260,16 +279,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 260 | { | 279 | { |
| 261 | // MACRODOWN only works in this function | 280 | // MACRODOWN only works in this function |
| 262 | switch(id) { | 281 | switch(id) { |
| 263 | case VERSION: | ||
| 264 | if (record->event.pressed) { | ||
| 265 | SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); | ||
| 266 | } | ||
| 267 | break; | ||
| 268 | case EEPROM: | ||
| 269 | if (record->event.pressed) { // For resetting EEPROM | ||
| 270 | eeconfig_init(); | ||
| 271 | } | ||
| 272 | break; | ||
| 273 | case DLEFT: | 282 | case DLEFT: |
| 274 | if (record->event.pressed) { // Windows move desktop left | 283 | if (record->event.pressed) { // Windows move desktop left |
| 275 | return MACRO(D(LCTL), D(LGUI), T(LEFT), U(LGUI), U(LCTL), END); | 284 | return MACRO(D(LCTL), D(LGUI), T(LEFT), U(LGUI), U(LCTL), END); |
| @@ -289,46 +298,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 289 | if (record->event.pressed) { | 298 | if (record->event.pressed) { |
| 290 | return MACRO(D(LSFT), T(TAB), U(LSFT), END); | 299 | return MACRO(D(LSFT), T(TAB), U(LSFT), END); |
| 291 | } | 300 | } |
| 292 | case REFACTOR: | ||
| 293 | if (record->event.pressed) { // VS Refactor CTRL+R, R | ||
| 294 | return MACRO(D(LCTL), T(R), U(LCTL), T(R), END); | ||
| 295 | } | ||
| 296 | break; | ||
| 297 | case TEST: | ||
| 298 | if (record->event.pressed) { // VS Run Tests CTRL+R, T | ||
| 299 | return MACRO(D(LCTL), T(R), U(LCTL), T(T), END); | ||
| 300 | } | ||
| 301 | break; | ||
| 302 | case DEBUG_TEST: | ||
| 303 | if (record->event.pressed) { // VS Debug Tests CTRL+R, CTRL+T | ||
| 304 | return MACRO(D(LCTL), T(R), T(T), U(LCTL), END); | ||
| 305 | } | ||
| 306 | break; | ||
| 307 | case FORMAT: | ||
| 308 | if (record->event.pressed) { // VS Format Document, CTRL+K, CTRL+D | ||
| 309 | return MACRO(D(LCTL), T(K), T(D), U(LCTL), END); | ||
| 310 | } | ||
| 311 | break; | ||
| 312 | case BUILD: | ||
| 313 | if (record->event.pressed) { // VS Build. Sends CTRL+SHFT+B | ||
| 314 | return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END); | ||
| 315 | } | ||
| 316 | break; | ||
| 317 | case GO_TO_IMPL: | ||
| 318 | if (record->event.pressed) { // VS Go To Implementation. Sends CTRL+F12 | ||
| 319 | return MACRO(D(LCTL), T(F12), U(LCTL), END); | ||
| 320 | } | ||
| 321 | break; | ||
| 322 | case FIND_ALL_REF: | ||
| 323 | if (record->event.pressed) { // VS Find All References. Sends CTRL+K, R | ||
| 324 | return MACRO(D(LCTL), T(K), U(LCTL), T(R), END); | ||
| 325 | } | ||
| 326 | break; | ||
| 327 | case REMOVE_SORT_USINGS: | ||
| 328 | if (record->event.pressed) { | ||
| 329 | return MACRO(D(LCTL), T(R), T(G), U(LCTL), END); | ||
| 330 | } | ||
| 331 | break; | ||
| 332 | case KEEPASS_OPEN: | 301 | case KEEPASS_OPEN: |
| 333 | if (record->event.pressed) { // Keepass open application | 302 | if (record->event.pressed) { // Keepass open application |
| 334 | return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END); | 303 | return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END); |
| @@ -339,27 +308,22 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 339 | return MACRO(D(LCTL), D(LALT), T(A), U(LALT), U(LCTL), END); | 308 | return MACRO(D(LCTL), D(LALT), T(A), U(LALT), U(LCTL), END); |
| 340 | } | 309 | } |
| 341 | break; | 310 | break; |
| 311 | case TERM_CP: | ||
| 312 | if (record->event.pressed) { // Terminal Copy | ||
| 313 | return MACRO(D(LCTL), T(INSERT), U(LCTL), END); | ||
| 314 | } | ||
| 315 | break; | ||
| 316 | case TERM_PT: | ||
| 317 | if (record->event.pressed) { // Terminal Paste | ||
| 318 | return MACRO(D(LSFT), T(INSERT), U(LSFT), END); | ||
| 319 | } | ||
| 320 | break; | ||
| 342 | } | 321 | } |
| 343 | return MACRO_NONE; | 322 | return MACRO_NONE; |
| 344 | }; | 323 | }; |
| 345 | 324 | ||
| 346 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 325 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 347 | tap_dance_process_record(keycode); | 326 | tap_dance_process_record(keycode); |
| 348 | switch (keycode) { | ||
| 349 | // dynamically generate these. | ||
| 350 | case EPRM: | ||
| 351 | if (record->event.pressed) { | ||
| 352 | eeconfig_init(); | ||
| 353 | } | ||
| 354 | return false; | ||
| 355 | break; | ||
| 356 | case VRSN: | ||
| 357 | if (record->event.pressed) { | ||
| 358 | SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); | ||
| 359 | } | ||
| 360 | return false; | ||
| 361 | break; | ||
| 362 | } | ||
| 363 | return true; | 327 | return true; |
| 364 | } | 328 | } |
| 365 | 329 | ||
diff --git a/layouts/community/ergodox/333fred/visualizer.c b/layouts/community/ergodox/333fred/visualizer.c index 2a30562ae..d13b3cd79 100644 --- a/layouts/community/ergodox/333fred/visualizer.c +++ b/layouts/community/ergodox/333fred/visualizer.c | |||
| @@ -14,16 +14,22 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) { | |||
| 14 | if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { | 14 | if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { |
| 15 | saturation = 255; | 15 | saturation = 255; |
| 16 | } | 16 | } |
| 17 | if (state->status.layer & 0x10) { | 17 | if (state->status.layer & 0x80) { |
| 18 | state->target_lcd_color = LCD_COLOR(0, 255, 60); | ||
| 19 | state->layer_text = "Game Arrow"; | ||
| 20 | } else if (state->status.layer & 0x40) { | ||
| 21 | state->target_lcd_color = LCD_COLOR(0, 255, 60); | ||
| 22 | state->layer_text = "Game"; | ||
| 23 | } else if (state->status.layer & 0x20) { | ||
| 18 | state->target_lcd_color = LCD_COLOR(140, 100, 60); | 24 | state->target_lcd_color = LCD_COLOR(140, 100, 60); |
| 19 | state->layer_text = "Movement"; | 25 | state->layer_text = "Movement"; |
| 20 | } else if (state->status.layer & 0x8) { | 26 | } else if (state->status.layer & 0x10) { |
| 21 | state->target_lcd_color = LCD_COLOR(0, saturation, 0xFF); | 27 | state->target_lcd_color = LCD_COLOR(0, saturation, 0xFF); |
| 22 | state->layer_text = "Media"; | 28 | state->layer_text = "Media"; |
| 23 | } else if (state->status.layer & 0x4) { | 29 | } else if (state->status.layer & 0x8) { |
| 24 | state->target_lcd_color = LCD_COLOR(168, saturation, 0xFF); | 30 | state->target_lcd_color = LCD_COLOR(168, saturation, 0xFF); |
| 25 | state->layer_text = "Symbol"; | 31 | state->layer_text = "Symbol"; |
| 26 | } else if (state->status.layer & 0x2) { | 32 | } else if (state->status.layer & 0x2 || state->status.layer & 0x4) { |
| 27 | state->target_lcd_color = LCD_COLOR(216, 90, 0xFF); | 33 | state->target_lcd_color = LCD_COLOR(216, 90, 0xFF); |
| 28 | state->layer_text = "Code"; | 34 | state->layer_text = "Code"; |
| 29 | } else { | 35 | } else { |
diff --git a/users/333fred/333fred.h b/users/333fred/333fred.h index 3b6f21133..443930a6b 100644 --- a/users/333fred/333fred.h +++ b/users/333fred/333fred.h | |||
| @@ -4,11 +4,12 @@ | |||
| 4 | 4 | ||
| 5 | #define BASE 0 | 5 | #define BASE 0 |
| 6 | #define CODE 1 // code layer | 6 | #define CODE 1 // code layer |
| 7 | #define SYMB 2 | 7 | #define CODEFLOW 2 |
| 8 | #define MDIA 3 // media keys | 8 | #define SYMB 3 |
| 9 | #define VIM 4 | 9 | #define MDIA 4 // media keys |
| 10 | #define GAME 5 | 10 | #define VIM 5 |
| 11 | #define GAME_ARROW 6 | 11 | #define GAME 6 |
| 12 | #define GAME_ARROW 7 | ||
| 12 | 13 | ||
| 13 | // Tap dance config shared between my keyboards | 14 | // Tap dance config shared between my keyboards |
| 14 | enum tap_dance_declarations { | 15 | enum tap_dance_declarations { |
