diff options
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/josh/keymap.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/keyboards/ergodox_ez/keymaps/josh/keymap.c b/keyboards/ergodox_ez/keymaps/josh/keymap.c index de5664a25..9ceb87423 100644 --- a/keyboards/ergodox_ez/keymaps/josh/keymap.c +++ b/keyboards/ergodox_ez/keymaps/josh/keymap.c | |||
| @@ -7,15 +7,16 @@ | |||
| 7 | #define MDIA 2 // media keys | 7 | #define MDIA 2 // media keys |
| 8 | 8 | ||
| 9 | //macros | 9 | //macros |
| 10 | #define CTL_SFT_T 100 | 10 | #define CTL_SFT_T 100 // open type |
| 11 | #define CTL_SFT_G 101 | 11 | #define CTL_SFT_G 101 // find references |
| 12 | #define CTL_ALT_H 102 | 12 | #define CTL_ALT_H 102 // open call hierarchy |
| 13 | #define CTL_SFT_R 103 // open resource | ||
| 13 | 14 | ||
| 14 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 15 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 15 | /* Keymap 0: Basic layer | 16 | /* Keymap 0: Basic layer |
| 16 | * | 17 | * |
| 17 | * ,--------------------------------------------------. ,--------------------------------------------------. | 18 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 18 | * | = | 1 | 2 | 3 | 4 | 5 | ESC | | M 100| 6 | 7 | 8 | 9 | 0 | - | | 19 | * | = | 1 | 2 | 3 | 4 | 5 | ESC | |M100/3| 6 | 7 | 8 | 9 | 0 | - | |
| 19 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 20 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 20 | * |TAB /Alt| Q | W | E | R | T | Meh | | Meh | Y | U | I | O | P |\ / ALT | | 21 | * |TAB /Alt| Q | W | E | R | T | Meh | | Meh | Y | U | I | O | P |\ / ALT | |
| 21 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 22 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| @@ -46,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 46 | KC_HOME, | 47 | KC_HOME, |
| 47 | KC_SPC,KC_BSPC,KC_END, | 48 | KC_SPC,KC_BSPC,KC_END, |
| 48 | // right hand | 49 | // right hand |
| 49 | M(CTL_SFT_T),KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | 50 | LT(M(CTL_SFT_T), M(CTL_SFT_R)),KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, |
| 50 | MEH_T(KC_NO),KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | 51 | MEH_T(KC_NO),KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, |
| 51 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),CTL_T(KC_QUOT), | 52 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),CTL_T(KC_QUOT), |
| 52 | MO(SYMB), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, | 53 | MO(SYMB), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, |
| @@ -171,6 +172,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 171 | } | 172 | } |
| 172 | return MACRO(U(LCTL), U(LALT), END); | 173 | return MACRO(U(LCTL), U(LALT), END); |
| 173 | break; | 174 | break; |
| 175 | case CTL_SFT_R: | ||
| 176 | if (record->event.pressed) { | ||
| 177 | return MACRO(D(LCTL), D(LSFT), T(R), END); | ||
| 178 | } | ||
| 179 | return MACRO(U(LCTL), U(LSFT), END); | ||
| 180 | break; | ||
| 174 | } | 181 | } |
| 175 | return MACRO_NONE; | 182 | return MACRO_NONE; |
| 176 | }; | 183 | }; |
