diff options
| author | MechMerlin <mechmerlin@gmail.com> | 2017-08-01 11:39:47 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-08-02 16:05:46 -0400 |
| commit | 29fcb64bb4f4b7cbb7033e1ce82da6072b7f3092 (patch) | |
| tree | 66b9ff40b320513254bfde742c12431d055384ce /keyboards | |
| parent | 70cc193d14474a59f863b7278cf924ee159ed16d (diff) | |
add KC_Grave and fix typo on readme
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/kc60/keymaps/mechmerlin/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kc60/keymaps/mechmerlin/readme.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/kc60/keymaps/mechmerlin/keymap.c b/keyboards/kc60/keymaps/mechmerlin/keymap.c index 7566586b9e..39ac8c45f6 100644 --- a/keyboards/kc60/keymaps/mechmerlin/keymap.c +++ b/keyboards/kc60/keymaps/mechmerlin/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, MO(1), KC_RALT, KC_RGUI, KC_RCTL \ ), [1] = KEYMAP( /* FN Layer 1 */ - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, \ KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_NO, KC_PGUP, \ diff --git a/keyboards/kc60/keymaps/mechmerlin/readme.md b/keyboards/kc60/keymaps/mechmerlin/readme.md index 6810c9620b..10fb927aee 100644 --- a/keyboards/kc60/keymaps/mechmerlin/readme.md +++ b/keyboards/kc60/keymaps/mechmerlin/readme.md @@ -7,7 +7,7 @@ This is the 60% layout used by MechMerlin. It has 3 layers, base QWERTY, FN 1, a - Highly influenced by the KBP V60 and WKL B.Face standard layouts - Does not support any form of inswitch or underglow lighting as Merlin hates them. - Arrow toggle switch is FN + Space -- Rest is FN + R +- Reset is FN + R ### Build |