diff options
author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-05-20 09:59:02 -0700 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-05-20 09:59:02 -0700 |
commit | 0b591fd84394e2c07d3047fb29e734b612bfc248 (patch) | |
tree | b0c4196d8ebdb17970c6be02f9da43f133e25560 /keyboards/kc60 | |
parent | c9102f9e35f479bd7d5dd06ce10a5089b199fb0d (diff) | |
download | qmk_firmware-0b591fd84394e2c07d3047fb29e734b612bfc248.tar.gz qmk_firmware-0b591fd84394e2c07d3047fb29e734b612bfc248.zip |
Merlin community layouts (#3004)
* community layout support for eagle_viper v2 and remove mechmerlin keymap dir
* community layout support for eagle_viper v2 and remove mechmerlin keymap dir
* Change to QMK_KEYBOARD_H and remove merlin keymap in favor of cmmunity layouts
* community layout support 60_ansi
* community layout support for 60_ansi
Diffstat (limited to 'keyboards/kc60')
-rw-r--r-- | keyboards/kc60/keymaps/dbroqua/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/mechmerlin/keymap.c | 61 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/mechmerlin/readme.md | 20 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/sgoodwin/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/stanleylai/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/wigguno/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/workman-dead/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kc60/keymaps/ws2812/keymap.c | 2 |
10 files changed, 8 insertions, 89 deletions
diff --git a/keyboards/kc60/keymaps/dbroqua/keymap.c b/keyboards/kc60/keymaps/dbroqua/keymap.c index 4834659ae..f28e441b0 100644 --- a/keyboards/kc60/keymaps/dbroqua/keymap.c +++ b/keyboards/kc60/keymaps/dbroqua/keymap.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | #include "kc60.h" | 2 | #include QMK_KEYBOARD_H |
3 | 3 | ||
4 | #define _QWERTY 0 | 4 | #define _QWERTY 0 |
5 | #define _FNCAPS 1 | 5 | #define _FNCAPS 1 |
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c index 93b3adae2..10e00650d 100644 --- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c +++ b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | #include "kc60.h" | 2 | #include QMK_KEYBOARD_H |
3 | 3 | ||
4 | #define _QWERTY 0 | 4 | #define _QWERTY 0 |
5 | #define _FN 1 | 5 | #define _FN 1 |
diff --git a/keyboards/kc60/keymaps/default/keymap.c b/keyboards/kc60/keymaps/default/keymap.c index 2736745f2..045ab810f 100644 --- a/keyboards/kc60/keymaps/default/keymap.c +++ b/keyboards/kc60/keymaps/default/keymap.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | #include "kc60.h" | 2 | #include QMK_KEYBOARD_H |
3 | 3 | ||
4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
5 | [0] = LAYOUT( /* Basic QWERTY */ | 5 | [0] = LAYOUT( /* Basic QWERTY */ |
diff --git a/keyboards/kc60/keymaps/mechmerlin/keymap.c b/keyboards/kc60/keymaps/mechmerlin/keymap.c deleted file mode 100644 index d27493e16..000000000 --- a/keyboards/kc60/keymaps/mechmerlin/keymap.c +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | // This is the 60% layout preferred by u/merlin36 the host of the MechMerlin YouTube channel. | ||
2 | // The layout is highly influenced by the WKL B.Face and KBP V60 standard layouts. | ||
3 | // Layout designed for use on KC60 with no inswitch or underglow lighting. | ||
4 | |||
5 | #include "kc60.h" | ||
6 | |||
7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
8 | [0] = LAYOUT( /* Basic QWERTY */ | ||
9 | KC_ESC, 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, \ | ||
10 | 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, \ | ||
11 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ | ||
12 | KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ | ||
13 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, MO(2), KC_RALT, KC_RGUI, KC_RCTL \ | ||
14 | ), | ||
15 | [1] = LAYOUT( /* HHKB-ish Base Layout */ | ||
16 | KC_ESC, 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_BSLS, \ | ||
17 | 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_DEL, \ | ||
18 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ | ||
19 | KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ | ||
20 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, MO(3), KC_RALT, KC_RGUI, KC_RCTL \ | ||
21 | ), | ||
22 | [2] = LAYOUT( /* FN Layer 1 - Basic QWERTY */ | ||
23 | 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, \ | ||
24 | 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, \ | ||
25 | KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, \ | ||
26 | 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, \ | ||
27 | KC_TRNS, KC_TRNS, KC_TRNS, TG(4), KC_NO, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ | ||
28 | ), | ||
29 | [3] = LAYOUT( /* FN Layer 2 - HHKB-ish Base Layout */ | ||
30 | 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_INS, \ | ||
31 | KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_BSPC, \ | ||
32 | KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_NO, KC_TRNS, \ | ||
33 | KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_NO, KC_TRNS, \ | ||
34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ | ||
35 | ), | ||
36 | [4] = LAYOUT( /* Arrow Layers - Basic QWERTY ONLY */ | ||
37 | 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, \ | ||
38 | 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, \ | ||
39 | 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_NO, KC_TRNS, \ | ||
40 | KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_UP, \ | ||
41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT \ | ||
42 | ), | ||
43 | [5] = LAYOUT( /* Blank Layer for later usage */ | ||
44 | 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, \ | ||
45 | 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, \ | ||
46 | 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_NO, KC_TRNS, \ | ||
47 | KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, \ | ||
48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ | ||
49 | ), | ||
50 | |||
51 | }; | ||
52 | |||
53 | const uint16_t PROGMEM fn_actions[] = { | ||
54 | |||
55 | }; | ||
56 | |||
57 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||
58 | { | ||
59 | // MACRODOWN only works in this function | ||
60 | return MACRO_NONE; | ||
61 | }; | ||
diff --git a/keyboards/kc60/keymaps/mechmerlin/readme.md b/keyboards/kc60/keymaps/mechmerlin/readme.md deleted file mode 100644 index 3a67ab17f..000000000 --- a/keyboards/kc60/keymaps/mechmerlin/readme.md +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | MechMerlin's KC60 Layout | ||
2 | ====================== | ||
3 | |||
4 | This is the 60% layout used by u/merlin36, host of the MechMerlin YouTube channel. | ||
5 | It has 5 layers, base QWERTY, base HHKB, FN 1, FN 2(HHKB), and an arrows only layer. | ||
6 | |||
7 | Merlin's KC60 was acquired from Massdrop: https://www.massdrop.com/buy/kc60-mechanical-keyboard and is the Co-Star stabilizer version | ||
8 | |||
9 | If you would like to program your KC60 using the manufacturer recommended approach, please follow the guide on keychatter: https://www.keychatter.com/2015/07/05/programming-the-kc60/. | ||
10 | |||
11 | ## Keymap Notes | ||
12 | - Highly influenced by the KBP V60 and WKL B.Face standard layouts | ||
13 | - Does not support any form of inswitch or underglow lighting as Merlin hates them. | ||
14 | - Arrow toggle switch is FN + Space | ||
15 | - Reset is FN + R | ||
16 | - HHKB keymap is approximate as keyboard is not built like HHKB | ||
17 | |||
18 | |||
19 | ### Build | ||
20 | To build this keymap, simply run `make KEYMAP=mechmerlin`. | ||
diff --git a/keyboards/kc60/keymaps/sgoodwin/keymap.c b/keyboards/kc60/keymaps/sgoodwin/keymap.c index fc7d6c844..25870d0a7 100644 --- a/keyboards/kc60/keymaps/sgoodwin/keymap.c +++ b/keyboards/kc60/keymaps/sgoodwin/keymap.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | #include "kc60.h" | 2 | #include QMK_KEYBOARD_H |
3 | 3 | ||
4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
5 | /* | 5 | /* |
diff --git a/keyboards/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c index 7f7afdf75..887b5da72 100644 --- a/keyboards/kc60/keymaps/stanleylai/keymap.c +++ b/keyboards/kc60/keymaps/stanleylai/keymap.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | #include "kc60.h" | 2 | #include QMK_KEYBOARD_H |
3 | 3 | ||
4 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 4 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
5 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 5 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
diff --git a/keyboards/kc60/keymaps/wigguno/keymap.c b/keyboards/kc60/keymaps/wigguno/keymap.c index caff9b837..a4a946f0d 100644 --- a/keyboards/kc60/keymaps/wigguno/keymap.c +++ b/keyboards/kc60/keymaps/wigguno/keymap.c | |||
@@ -2,7 +2,7 @@ | |||
2 | // It also moves the reset key off the base layer, as in the default kc60 layout for this firmware. | 2 | // It also moves the reset key off the base layer, as in the default kc60 layout for this firmware. |
3 | // I have swapped FN and RGUI as my rainbow keyset has them in the opposite order. | 3 | // I have swapped FN and RGUI as my rainbow keyset has them in the opposite order. |
4 | 4 | ||
5 | #include "kc60.h" | 5 | #include QMK_KEYBOARD_H |
6 | 6 | ||
7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
8 | 8 | ||
diff --git a/keyboards/kc60/keymaps/workman-dead/keymap.c b/keyboards/kc60/keymaps/workman-dead/keymap.c index abb9785c3..b524b61cf 100644 --- a/keyboards/kc60/keymaps/workman-dead/keymap.c +++ b/keyboards/kc60/keymaps/workman-dead/keymap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "kc60.h" | 1 | #include QMK_KEYBOARD_H |
2 | 2 | ||
3 | #define _WM 0 | 3 | #define _WM 0 |
4 | #define _QW 1 | 4 | #define _QW 1 |
diff --git a/keyboards/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c index 50b30ac23..d445df337 100644 --- a/keyboards/kc60/keymaps/ws2812/keymap.c +++ b/keyboards/kc60/keymaps/ws2812/keymap.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | #include "kc60.h" | 2 | #include QMK_KEYBOARD_H |
3 | 3 | ||
4 | // Used for SHIFT_ESC | 4 | // Used for SHIFT_ESC |
5 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | 5 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) |