diff options
| author | Fredric Silberberg <fred@silberberg.xyz> | 2017-08-05 14:54:16 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-08-08 10:02:53 -0400 |
| commit | fb91d9008b051c4af5b8ff8952a02836061b8e60 (patch) | |
| tree | 24140fc718f032383f1ef3872b74a3232d1da1be | |
| parent | 1219da753bc5475f48b1cfe420bd916aa399fc60 (diff) | |
| download | qmk_firmware-fb91d9008b051c4af5b8ff8952a02836061b8e60.tar.gz qmk_firmware-fb91d9008b051c4af5b8ff8952a02836061b8e60.zip | |
Additional keymap updates.
| -rw-r--r-- | keyboards/nyquist/keymaps/333fred/config.h | 5 | ||||
| -rw-r--r-- | keyboards/nyquist/keymaps/333fred/keymap.c | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/keyboards/nyquist/keymaps/333fred/config.h b/keyboards/nyquist/keymaps/333fred/config.h index f2408c0e3..92096eba2 100644 --- a/keyboards/nyquist/keymaps/333fred/config.h +++ b/keyboards/nyquist/keymaps/333fred/config.h | |||
| @@ -31,4 +31,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 31 | // #define _MASTER_RIGHT | 31 | // #define _MASTER_RIGHT |
| 32 | // #define EE_HANDS | 32 | // #define EE_HANDS |
| 33 | 33 | ||
| 34 | #undef TAPPING_TERM | ||
| 35 | #define TAPPING_TERM 150 | ||
| 36 | |||
| 37 | #define PERMISSIVE_HOLD | ||
| 38 | |||
| 34 | #endif | 39 | #endif |
diff --git a/keyboards/nyquist/keymaps/333fred/keymap.c b/keyboards/nyquist/keymaps/333fred/keymap.c index 74a12c54a..afa8b75b6 100644 --- a/keyboards/nyquist/keymaps/333fred/keymap.c +++ b/keyboards/nyquist/keymaps/333fred/keymap.c | |||
| @@ -9,11 +9,9 @@ extern keymap_config_t keymap_config; | |||
| 9 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | 9 | // Layer names don't all need to be of the same length, obviously, and you can also skip them |
| 10 | // entirely and just use numbers. | 10 | // entirely and just use numbers. |
| 11 | #define _QWERTY 0 | 11 | #define _QWERTY 0 |
| 12 | #define _COLEMAK 1 | 12 | #define _LOWER 1 |
| 13 | #define _DVORAK 2 | 13 | #define _RAISE 2 |
| 14 | #define _LOWER 3 | 14 | #define _VIM 3 |
| 15 | #define _RAISE 4 | ||
| 16 | #define _VIM 5 | ||
| 17 | #define _ADJUST 16 | 15 | #define _ADJUST 16 |
| 18 | 16 | ||
| 19 | enum custom_keycodes { | 17 | enum custom_keycodes { |
| @@ -45,15 +43,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 45 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 43 | * |------+------+------+------+------+------|------+------+------+------+------+------| |
| 46 | * | Shift| Z | X | C | V | B | N | M | , | . |/ Ctrl| Shift| | 44 | * | Shift| Z | X | C | V | B | N | M | , | . |/ Ctrl| Shift| |
| 47 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 45 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 48 | * |Adjust| Ctrl | Alt | GUI |Lower | Bksp | Ent | Spc | Raise| + | Up | Del | | 46 | * | Ctrl | Alt | F4 | GUI |Lower | Bksp | Spc | Ent | Raise| + | Up | Del | |
| 49 | * `-----------------------------------------------------------------------------------' | 47 | * `-----------------------------------------------------------------------------------' |
| 50 | */ | 48 | */ |
| 51 | [_QWERTY] = KEYMAP( \ | 49 | [_QWERTY] = KEYMAP( \ |
| 52 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \ | 50 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \ |
| 53 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \ | 51 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \ |
| 54 | KC_ESC, KC_A, KC_S, KC_D, LT(_VIM, KC_F), KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 52 | KC_ESC, KC_A, KC_S, KC_D, LT(_VIM, KC_F), KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 55 | OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \ | 53 | OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \ |
| 56 | ADJUST, KC_LCTL, KC_LGUI, KC_LALT, OSL(_LOWER), KC_BSPC, KC_ENT, KC_SPC, RAISE, KC_PLUS, KC_UP, KC_DEL \ | 54 | KC_LCTL, KC_LALT, KC_F4, KC_LGUI, OSL(_LOWER), KC_BSPC, KC_SPC, KC_ENT, RAISE, KC_PLUS, KC_UP, KC_DEL \ |
| 57 | ), | 55 | ), |
| 58 | 56 | ||
| 59 | /* Lower | 57 | /* Lower |
