From 1b8072df2a7dcf537aaf28cb3f1a3bfe9f81e32b Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Mon, 23 Sep 2019 07:32:05 -0700 Subject: [PATCH 1/4] readme updates for 60_ansi and split variations --- layouts/community/60_ansi/mechmerlin-ansi/readme.md | 10 ++++------ .../60_ansi_split_bs_rshift/mechmerlin-split/readme.md | 10 ++++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/layouts/community/60_ansi/mechmerlin-ansi/readme.md b/layouts/community/60_ansi/mechmerlin-ansi/readme.md index aefd6a992984..4d3f3d82034e 100644 --- a/layouts/community/60_ansi/mechmerlin-ansi/readme.md +++ b/layouts/community/60_ansi/mechmerlin-ansi/readme.md @@ -1,14 +1,12 @@ -MechMerlin's Standard ANSI 60% Layout -====================== +# MechMerlin's Standard ANSI 60% Layout This is the 60% layout used by u/merlin36, host of the [MechMerlin](www.youtube.com/mechmerlin) YouTube channel. -It is used on his -[Duck Eagle V2](https://github.com/qmk/qmk_firmware/tree/master/keyboards/eagle_viper/v2) -[NPKC KC60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kc60) +It is used on his [1up60HSE](https://github.com/qmk/qmk_firmware/tree/master/keyboards/1upkeyboards/1up60hse) -[HS60 V1](https://github.com/qmk/qmk_firmware/tree/master/keyboards/hs60/v1) +[dz60rgb-ansi](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz60rgb) +[HS60 V2](https://github.com/qmk/qmk_firmware/tree/master/keyboards/hs60/v2) ## Keymap Notes - Arrow toggle switch is tapping the `FN` key once. diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md index 855fd5ac9ec4..528776011e67 100644 --- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md +++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md @@ -1,13 +1,15 @@ -MechMerlin's Split ANSI 60% Layout -====================== +# MechMerlin's Split ANSI 60% Layout This is the 60% layout with split backspace and right shift used by u/merlin36, host of the [MechMerlin](www.youtube.com/mechmerlin) YouTube channel. It is used on his -[Sentraq S60-X RGB](https://github.com/qmk/qmk_firmware/tree/master/keyboards/s60_x) -[Zeal60 Rev4](https://github.com/qmk/qmk_firmware/tree/master/keyboards/zeal60) + [DO60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/do60) +[DP60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dp60) +[Sentraq S60-X RGB](https://github.com/qmk/qmk_firmware/tree/master/keyboards/s60_x) +[Waldo](https://github.com/qmk/qmk_firmware/tree/master/keyboards/waldo) +[Zeal60 Rev4](https://github.com/qmk/qmk_firmware/tree/master/keyboards/zeal60) ## Keymap Notes - Highly influenced by the KBP V60 and WKL B.Face standard layouts From 53e70778c394586228e2f51ca59755975e3219ca Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Mon, 23 Sep 2019 07:32:33 -0700 Subject: [PATCH 2/4] add new community layout for mechmerlin for the new default layout 65_ansi_blocker --- .../65_ansi_blocker/mechmerlin/keymap.c | 36 +++++++++++++++++++ .../65_ansi_blocker/mechmerlin/readme.md | 11 ++++++ .../65_ansi_blocker/mechmerlin/rules.mk | 1 + 3 files changed, 48 insertions(+) create mode 100644 layouts/community/65_ansi_blocker/mechmerlin/keymap.c create mode 100644 layouts/community/65_ansi_blocker/mechmerlin/readme.md create mode 100644 layouts/community/65_ansi_blocker/mechmerlin/rules.mk diff --git a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c new file mode 100644 index 000000000000..ee91c08115a0 --- /dev/null +++ b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2019 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H +#include "mechmerlin.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BL] = LAYOUT_65_ansi_blocker( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CTCP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FL] = LAYOUT_65_ansi_blocker( + 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, _______, _______, + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______, + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + ), +}; + diff --git a/layouts/community/65_ansi_blocker/mechmerlin/readme.md b/layouts/community/65_ansi_blocker/mechmerlin/readme.md new file mode 100644 index 000000000000..bf25484a16d2 --- /dev/null +++ b/layouts/community/65_ansi_blocker/mechmerlin/readme.md @@ -0,0 +1,11 @@ +# MechMerlin's 65_ansi_blocker layout + +This is the 65% layout used by u/merlin36, host of the [MechMerlin](www.youtube.com/mechmerlin) +YouTube channel. + +It is used on his +[RGB Doro67](https://github.com/qmk/qmk_firmware/tree/master/keyboards/doro67/rgb) +[KBD67 mkii](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67mkiirgb) + +### Build +To build the firmware file associated with this keymap, simply run `make your_keyboard:mechmerlin`. \ No newline at end of file diff --git a/layouts/community/65_ansi_blocker/mechmerlin/rules.mk b/layouts/community/65_ansi_blocker/mechmerlin/rules.mk new file mode 100644 index 000000000000..e2ce3d7731f9 --- /dev/null +++ b/layouts/community/65_ansi_blocker/mechmerlin/rules.mk @@ -0,0 +1 @@ +USER_NAME := mechmerlin \ No newline at end of file From b852a5f073f169bf7dbe8b6c6d810c178008d5d7 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 24 Sep 2019 05:17:24 -0700 Subject: [PATCH 3/4] change path now that kbd67 has been updated --- layouts/community/65_ansi_blocker/mechmerlin/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/community/65_ansi_blocker/mechmerlin/readme.md b/layouts/community/65_ansi_blocker/mechmerlin/readme.md index bf25484a16d2..fa69ce3e7dbd 100644 --- a/layouts/community/65_ansi_blocker/mechmerlin/readme.md +++ b/layouts/community/65_ansi_blocker/mechmerlin/readme.md @@ -5,7 +5,7 @@ YouTube channel. It is used on his [RGB Doro67](https://github.com/qmk/qmk_firmware/tree/master/keyboards/doro67/rgb) -[KBD67 mkii](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67mkiirgb) +[KBD67 mkii](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb) ### Build To build the firmware file associated with this keymap, simply run `make your_keyboard:mechmerlin`. \ No newline at end of file From 897790914cfbb266eb5f533ba7212db8b9ef8598 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 24 Sep 2019 05:17:34 -0700 Subject: [PATCH 4/4] fix up spacing --- layouts/community/65_ansi_blocker/mechmerlin/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c index ee91c08115a0..7ab719ab2628 100644 --- a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c +++ b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = LAYOUT_65_ansi_blocker( 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, _______, _______, - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END