diff options
| author | Josh Colbeck <skrymir@gmail.com> | 2016-07-06 20:24:57 -0500 |
|---|---|---|
| committer | Josh Colbeck <skrymir@gmail.com> | 2016-07-06 20:24:57 -0500 |
| commit | 5ed673d82d6cf91aa966a3e903ac37adb519f12c (patch) | |
| tree | 67aebd55b1538035a1e5839eff3bb66f89d2aca2 | |
| parent | 74d848c942984334f82d84acfecc3cce9716cd82 (diff) | |
| download | qmk_firmware-5ed673d82d6cf91aa966a3e903ac37adb519f12c.tar.gz qmk_firmware-5ed673d82d6cf91aa966a3e903ac37adb519f12c.zip | |
Changed layer switching to momentary
corrected macro
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/josh/keymap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/ergodox_ez/keymaps/josh/keymap.c b/keyboards/ergodox_ez/keymaps/josh/keymap.c index 4ad229182..de5664a25 100644 --- a/keyboards/ergodox_ez/keymaps/josh/keymap.c +++ b/keyboards/ergodox_ez/keymaps/josh/keymap.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | //macros | 9 | //macros |
| 10 | #define CTL_SFT_T 100 | 10 | #define CTL_SFT_T 100 |
| 11 | #define CTL_SFT_G 101 | 11 | #define CTL_SFT_G 101 |
| 12 | #define CTL_ALT_T 102 | 12 | #define CTL_ALT_H 102 |
| 13 | 13 | ||
| 14 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 14 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 15 | /* Keymap 0: Basic layer | 15 | /* Keymap 0: Basic layer |
| @@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 40 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, | 40 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, |
| 41 | ALT_T(KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, ALL_T(KC_NO), | 41 | ALT_T(KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, ALL_T(KC_NO), |
| 42 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, | 42 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, |
| 43 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_FN1, | 43 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(SYMB), |
| 44 | KC_LGUI, KC_GRV, M(CTL_ALT_T),M(CTL_SFT_G),LALT(KC_LSFT), | 44 | KC_LGUI, KC_GRV, M(CTL_ALT_H),M(CTL_SFT_G),LALT(KC_LSFT), |
| 45 | CTL_T(KC_APP), KC_LALT, | 45 | CTL_T(KC_APP), KC_LALT, |
| 46 | KC_HOME, | 46 | KC_HOME, |
| 47 | KC_SPC,KC_BSPC,KC_END, | 47 | KC_SPC,KC_BSPC,KC_END, |
| @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 49 | M(CTL_SFT_T),KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | 49 | M(CTL_SFT_T),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, | 50 | 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), | 51 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),CTL_T(KC_QUOT), |
| 52 | KC_FN1, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, | 52 | MO(SYMB), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, |
| 53 | LALT(KC_LSFT),KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, | 53 | LALT(KC_LSFT),KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, |
| 54 | KC_LALT, KC_CAPS, | 54 | KC_LALT, KC_CAPS, |
| 55 | KC_PGUP, | 55 | KC_PGUP, |
| @@ -165,9 +165,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 165 | } | 165 | } |
| 166 | return MACRO(U(LCTL), U(LSFT), END); | 166 | return MACRO(U(LCTL), U(LSFT), END); |
| 167 | break; | 167 | break; |
| 168 | case CTL_ALT_T: | 168 | case CTL_ALT_H: |
| 169 | if (record->event.pressed) { | 169 | if (record->event.pressed) { |
| 170 | return MACRO(D(LCTL), D(LALT), T(T), END); | 170 | return MACRO(D(LCTL), D(LALT), T(H), END); |
| 171 | } | 171 | } |
| 172 | return MACRO(U(LCTL), U(LALT), END); | 172 | return MACRO(U(LCTL), U(LALT), END); |
| 173 | break; | 173 | break; |
