aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-09-24 11:01:40 -0700
committernoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-09-24 11:01:40 -0700
commit494fc518129725b0cc9d62d4d23877ae0ed2e6e7 (patch)
tree3f8227efb17b0dd1ba6cebb2d5bb27090368fc8f
parentad8dbd5ca5390ad9e441943b705684fce521bc15 (diff)
downloadfirmware-494fc518129725b0cc9d62d4d23877ae0ed2e6e7.tar.gz
firmware-494fc518129725b0cc9d62d4d23877ae0ed2e6e7.tar.bz2
firmware-494fc518129725b0cc9d62d4d23877ae0ed2e6e7.zip
Merlin's Community Layout Updates (#6798)
* readme updates for 60_ansi and split variations * add new community layout for mechmerlin for the new default layout 65_ansi_blocker * change path now that kbd67 has been updated * fix up spacing
-rw-r--r--layouts/community/60_ansi/mechmerlin-ansi/readme.md10
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md10
-rw-r--r--layouts/community/65_ansi_blocker/mechmerlin/keymap.c36
-rw-r--r--layouts/community/65_ansi_blocker/mechmerlin/readme.md11
-rw-r--r--layouts/community/65_ansi_blocker/mechmerlin/rules.mk1
5 files changed, 58 insertions, 10 deletions
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/readme.md b/layouts/community/60_ansi/mechmerlin-ansi/readme.md
index aefd6a992..4d3f3d820 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 855fd5ac9..528776011 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
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 000000000..7ab719ab2
--- /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 <http://www.gnu.org/licenses/>.
+ */
+#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 000000000..fa69ce3e7
--- /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/kbd67/mkiirgb)
+
+### 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 000000000..e2ce3d773
--- /dev/null
+++ b/layouts/community/65_ansi_blocker/mechmerlin/rules.mk
@@ -0,0 +1 @@
+USER_NAME := mechmerlin \ No newline at end of file