diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2021-10-05 16:49:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 16:49:50 -0700 |
| commit | e8db309613c99d1ffe25320680368d41bf5c8535 (patch) | |
| tree | 8ffa09d1e15c3281eeac370cf3c3ffd664fec16f /layouts/community/75_ansi | |
| parent | e762db44bae46c631186c807a9c10fd8e4684535 (diff) | |
| download | qmk_firmware-e8db309613c99d1ffe25320680368d41bf5c8535.tar.gz qmk_firmware-e8db309613c99d1ffe25320680368d41bf5c8535.zip | |
[Keymap] Some updates to mechmerlin userspace and keymaps (#14711)
Diffstat (limited to 'layouts/community/75_ansi')
| -rw-r--r-- | layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c | 26 | ||||
| -rw-r--r-- | layouts/community/75_ansi/mechmerlin-75_ansi/readme.md | 4 |
2 files changed, 13 insertions, 17 deletions
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c index c239e2683..387f2d9ed 100644 --- a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c +++ b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c | |||
| @@ -12,20 +12,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 12 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), | 12 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), |
| 13 | 13 | ||
| 14 | [_FL] = LAYOUT_75_ansi(\ | 14 | [_FL] = LAYOUT_75_ansi(\ |
| 15 | RESET, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 15 | _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, _______, _______, |
| 16 | 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, KC_TRNS, | 16 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 17 | BL_TOGG, BL_INC, BL_DEC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 17 | BL_TOGG, BL_INC, BL_DEC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 18 | RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 18 | RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, |
| 19 | VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, | 19 | VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______, |
| 20 | KC_TRNS, KC_TRNS, KC_TRNS, MO(_CL), KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END), | 20 | _______, _______, _______, MO(_CL), _______, _______, _______, KC_HOME, KC_PGDN, KC_END), |
| 21 | 21 | ||
| 22 | [_CL] = LAYOUT_75_ansi(\ | 22 | [_CL] = LAYOUT_75_ansi(\ |
| 23 | 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, KC_TRNS, KC_TRNS, | 23 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 24 | 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, KC_TRNS, | 24 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 25 | KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 25 | _______, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 26 | 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, | 26 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 27 | 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_PGUP, KC_TRNS, | 27 | _______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 28 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), |
| 29 | |||
| 30 | |||
| 31 | }; | 29 | }; |
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md b/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md index d406155bc..8205abe28 100644 --- a/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md +++ b/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md | |||
| @@ -3,9 +3,7 @@ | |||
| 3 | This is the 75% layout used by u/merlin36, host of the [MechMerlin](www.youtube.com/mechmerlin) | 3 | This is the 75% layout used by u/merlin36, host of the [MechMerlin](www.youtube.com/mechmerlin) |
| 4 | YouTube channel. | 4 | YouTube channel. |
| 5 | 5 | ||
| 6 | It is used on his | 6 | MechMerlin currently has no keyboard supporting this layout. |
| 7 | * [Duck Octagon V2](https://github.com/qmk/qmk_firmware/tree/master/keyboards/duck/octagon/v2) | ||
| 8 | * [XD84](https://github.com/qmk/qmk_firmware/tree/master/keyboards/xd84) | ||
| 9 | 7 | ||
| 10 | ### Build | 8 | ### Build |
| 11 | To build the firmware file associated with this keymap, simply run `make your_keyboard:mechmerlin-ansi`. | 9 | To build the firmware file associated with this keymap, simply run `make your_keyboard:mechmerlin-ansi`. |
