diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-08-17 16:04:21 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-08-17 16:04:21 -0700 |
| commit | 8007d9f3a7583adeedd26fa7ab1622e06fed8034 (patch) | |
| tree | 5fb7089981ba63d2823e0ba4fbf65fa0de79ee20 | |
| parent | da24a34efbfdeb80190b78f3f59451af86c4fb8b (diff) | |
| download | qmk_firmware-8007d9f3a7583adeedd26fa7ab1622e06fed8034.tar.gz qmk_firmware-8007d9f3a7583adeedd26fa7ab1622e06fed8034.zip | |
Keyboard: Zen refactor and Configurator support (#3677)
* Matrix refactor
* Keymap refactor
* Configurator support
* Readme reformatting
| -rw-r--r-- | keyboards/zen/info.json | 12 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/default/keymap.c | 84 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/jwlawrence/keymap.c | 84 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/xyverz/keymap.c | 114 | ||||
| -rw-r--r-- | keyboards/zen/readme.md | 24 | ||||
| -rw-r--r-- | keyboards/zen/rev1/rev1.h | 2 | ||||
| -rw-r--r-- | keyboards/zen/zen.h | 18 |
7 files changed, 168 insertions, 170 deletions
diff --git a/keyboards/zen/info.json b/keyboards/zen/info.json new file mode 100644 index 000000000..f312529ed --- /dev/null +++ b/keyboards/zen/info.json | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Zen", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 17, | ||
| 6 | "height": 6.5, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "layout": [{"label":"k00", "x":0.5, "y":0}, {"label":"k01", "x":1.5, "y":0}, {"label":"k02", "x":2.5, "y":0}, {"label":"k03", "x":3.5, "y":0}, {"label":"k04", "x":4.5, "y":0}, {"label":"k05", "x":5.5, "y":0}, {"label":"k55", "x":10.5, "y":0}, {"label":"k54", "x":11.5, "y":0}, {"label":"k53", "x":12.5, "y":0}, {"label":"k52", "x":13.5, "y":0}, {"label":"k51", "x":14.5, "y":0}, {"label":"k50", "x":15.5, "y":0}, {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k65", "x":10.5, "y":1}, {"label":"k64", "x":11.5, "y":1}, {"label":"k63", "x":12.5, "y":1}, {"label":"k62", "x":13.5, "y":1}, {"label":"k61", "x":14.5, "y":1}, {"label":"k60", "x":15.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.5}, {"label":"k21", "x":1.5, "y":2}, {"label":"k22", "x":2.5, "y":2}, {"label":"k23", "x":3.5, "y":2}, {"label":"k24", "x":4.5, "y":2}, {"label":"k25", "x":5.5, "y":2}, {"label":"k75", "x":10.5, "y":2}, {"label":"k74", "x":11.5, "y":2}, {"label":"k73", "x":12.5, "y":2}, {"label":"k72", "x":13.5, "y":2}, {"label":"k71", "x":14.5, "y":2}, {"label":"k70", "x":15.5, "y":2, "w":1.5}, {"label":"k30", "x":0, "y":3, "w":1.5}, {"label":"k31", "x":1.5, "y":3}, {"label":"k32", "x":2.5, "y":3}, {"label":"k33", "x":3.5, "y":3}, {"label":"k34", "x":4.5, "y":3}, {"label":"k35", "x":5.5, "y":3}, {"label":"k85", "x":10.5, "y":3}, {"label":"k84", "x":11.5, "y":3}, {"label":"k83", "x":12.5, "y":3}, {"label":"k82", "x":13.5, "y":3}, {"label":"k81", "x":14.5, "y":3}, {"label":"k80", "x":15.5, "y":3, "w":1.5}, {"label":"k40", "x":0, "y":4, "w":1.5}, {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4}, {"label":"k43", "x":3.5, "y":4}, {"label":"k44", "x":4.5, "y":4}, {"label":"k45", "x":6, "y":4.5, "h":2}, {"label":"k46", "x":7, "y":4.5, "h":2}, {"label":"k96", "x":9, "y":4.5, "h":2}, {"label":"k95", "x":10, "y":4.5, "h":2}, {"label":"k94", "x":11.5, "y":4}, {"label":"k93", "x":12.5, "y":4}, {"label":"k92", "x":13.5, "y":4}, {"label":"k91", "x":14.5, "y":4}, {"label":"k90", "x":15.5, "y":4, "w":1.5}] | ||
| 10 | } | ||
| 11 | } | ||
| 12 | } | ||
diff --git a/keyboards/zen/keymaps/default/keymap.c b/keyboards/zen/keymaps/default/keymap.c index a955e892f..e9e7d798c 100644 --- a/keyboards/zen/keymaps/default/keymap.c +++ b/keyboards/zen/keymaps/default/keymap.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | #include "zen.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
| @@ -24,47 +22,47 @@ enum custom_keycodes { | |||
| 24 | 22 | ||
| 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 23 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 26 | 24 | ||
| 27 | /* Qwerty | 25 | /* Qwerty |
| 28 | * ,-----------------------------------------. .-----------------------------------------. | 26 | * ,-----------------------------------------. .-----------------------------------------. |
| 29 | * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | | 27 | * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | |
| 30 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 28 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 31 | * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | | 29 | * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | |
| 32 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 30 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 33 | * |CAPS(NAV)|A | S | D | F | G | | H | J | K | L | ; | " | | 31 | * |CAPS(NAV)|A | S | D | F | G | | H | J | K | L | ; | " | |
| 34 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 32 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 35 | * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter | | 33 | * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter | |
| 36 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| | 34 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| |
| 37 | * | Ctrl | GUI | Alt |RGBTOG| NAV |Space |Delete||Enter|Space | NAV | - | = | PGUP | PGDN | | 35 | * | Ctrl | GUI | Alt |RGBTOG| NAV |Space |Delete||Enter|Space | NAV | - | = | PGUP | PGDN | |
| 38 | * `------------------------------------------------''-----------------------------------------------' | 36 | * `------------------------------------------------''-----------------------------------------------' |
| 39 | */ | 37 | */ |
| 40 | [_QWERTY] = KEYMAP( \ | 38 | [_QWERTY] = LAYOUT( \ |
| 41 | KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 39 | KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 42 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ | 40 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ |
| 43 | LT(_NAV, KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 41 | LT(_NAV, KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 44 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | 42 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
| 45 | KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, MO(_NAV), KC_SPC, KC_DEL, KC_ENT, KC_SPACE, MO(_NAV), KC_MINS, KC_EQL, KC_PGUP, KC_PGDN \ | 43 | KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, MO(_NAV), KC_SPC, KC_DEL, KC_ENT, KC_SPACE, MO(_NAV), KC_MINS, KC_EQL, KC_PGUP, KC_PGDN \ |
| 46 | ), | 44 | ), |
| 47 | 45 | ||
| 48 | /* NAV | 46 | /* NAV |
| 49 | * ,-----------------------------------------. .-----------------------------------------. | 47 | * ,-----------------------------------------. .-----------------------------------------. |
| 50 | * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | 48 | * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | |
| 51 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 49 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 52 | * | |RGBSAI|RGBVAI|RGBSAD| RESET| [ | | ] | Pgup | Up | Pgdn |Insert| Home | | 50 | * | |RGBSAI|RGBVAI|RGBSAD| RESET| [ | | ] | Pgup | Up | Pgdn |Insert| Home | |
| 53 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 51 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 54 | * | |RGBHUD|RGBVAD|RGBHUI| | | | | Left | Down | Right|Delete| End | | 52 | * | |RGBHUD|RGBVAD|RGBHUI| | | | | Left | Down | Right|Delete| End | |
| 55 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 53 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 56 | * |Shift | | | | | | | NKRO | | | Pause| Back | Next | | 54 | * |Shift | | | | | | | NKRO | | | Pause| Back | Next | |
| 57 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| | 55 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| |
| 58 | * | Ctrl | GUI | Alt |RGBMOD| | | || | | | | Mute | VOLUP| VOLDN| | 56 | * | Ctrl | GUI | Alt |RGBMOD| | | || | | | | Mute | VOLUP| VOLDN| |
| 59 | * `------------------------------------------------''-----------------------------------------------' | 57 | * `------------------------------------------------''-----------------------------------------------' |
| 60 | */ | 58 | */ |
| 61 | [_NAV] = KEYMAP( \ | 59 | [_NAV] = LAYOUT( \ |
| 62 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 , \ | 60 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
| 63 | KC_TRNS, RGB_SAI, RGB_VAI, RGB_SAD, RESET, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME , \ | 61 | _______, RGB_SAI, RGB_VAI, RGB_SAD, RESET, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, \ |
| 64 | KC_TRNS, RGB_HUD, RGB_VAD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END , \ | 62 | _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, \ |
| 65 | KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT , \ | 63 | KC_LSFT, _______, _______, _______, _______, _______, MAGIC_TOGGLE_NKRO, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, \ |
| 66 | KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLU, KC_VOLD \ | 64 | KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD \ |
| 67 | ), | 65 | ), |
| 68 | 66 | ||
| 69 | }; | 67 | }; |
| 70 | 68 | ||
diff --git a/keyboards/zen/keymaps/jwlawrence/keymap.c b/keyboards/zen/keymaps/jwlawrence/keymap.c index ca7056718..1ca9b78c0 100644 --- a/keyboards/zen/keymaps/jwlawrence/keymap.c +++ b/keyboards/zen/keymaps/jwlawrence/keymap.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | #include "zen.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
| @@ -24,47 +22,47 @@ enum custom_keycodes { | |||
| 24 | 22 | ||
| 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 23 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 26 | 24 | ||
| 27 | /* Qwerty | 25 | /* Qwerty |
| 28 | * ,-----------------------------------------. .-----------------------------------------. | 26 | * ,-----------------------------------------. .-----------------------------------------. |
| 29 | * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | | 27 | * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | |
| 30 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 28 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 31 | * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | | 29 | * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | |
| 32 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 30 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 33 | * |CAPS(NAV)|A | S | D | F | G | | H | J | K | L | ; | " | | 31 | * |CAPS(NAV)|A | S | D | F | G | | H | J | K | L | ; | " | |
| 34 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 32 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 35 | * | Shift| Z | X | C | V | B | | N | M | , | . | / |Shift | | 33 | * | Shift| Z | X | C | V | B | | N | M | , | . | / |Shift | |
| 36 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| | 34 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| |
| 37 | * | Ctrl | Alt | GUI | GUI | NAV |Space |Delete||Enter|Space | NAV | - | = |RGBTOG|Enter | | 35 | * | Ctrl | Alt | GUI | GUI | NAV |Space |Delete||Enter|Space | NAV | - | = |RGBTOG|Enter | |
| 38 | * `------------------------------------------------''-----------------------------------------------' | 36 | * `------------------------------------------------''-----------------------------------------------' |
| 39 | */ | 37 | */ |
| 40 | [_QWERTY] = KEYMAP( \ | 38 | [_QWERTY] = LAYOUT( \ |
| 41 | KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 39 | KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 42 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ | 40 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ |
| 43 | LT(_NAV, KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 41 | LT(_NAV, KC_CAPS),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 44 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 42 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| 45 | KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, MO(_NAV), KC_SPC, KC_DEL, KC_ENT, KC_SPACE, MO(_NAV), KC_MINS, KC_EQL, RGB_TOG, KC_ENT \ | 43 | KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, MO(_NAV), KC_SPC, KC_DEL, KC_ENT, KC_SPACE, MO(_NAV), KC_MINS, KC_EQL, RGB_TOG, KC_ENT \ |
| 46 | ), | 44 | ), |
| 47 | 45 | ||
| 48 | /* NAV | 46 | /* NAV |
| 49 | * ,-----------------------------------------. .-----------------------------------------. | 47 | * ,-----------------------------------------. .-----------------------------------------. |
| 50 | * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | 48 | * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | |
| 51 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 49 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 52 | * | |RGBSAI|RGBVAI|RGBSAD| RESET| [ | | ] | Pgup | Up | Pgdn |Insert| Home | | 50 | * | |RGBSAI|RGBVAI|RGBSAD| RESET| [ | | ] | Pgup | Up | Pgdn |Insert| Home | |
| 53 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 51 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 54 | * | |RGBHUD|RGBVAD|RGBHUI|RGBMOD| | | | Left | Down | Right|Delete| End | | 52 | * | |RGBHUD|RGBVAD|RGBHUI|RGBMOD| | | | Left | Down | Right|Delete| End | |
| 55 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 53 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
| 56 | * |Shift | | | | | | | NKRO | | | Pause| Back | Next | | 54 | * |Shift | | | | | | | NKRO | | | Pause| Back | Next | |
| 57 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| | 55 | * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------| |
| 58 | * | Ctrl | Alt | GUI | | | | || | | | | Mute | VOLUP| VOLDN| | 56 | * | Ctrl | Alt | GUI | | | | || | | | | Mute | VOLUP| VOLDN| |
| 59 | * `------------------------------------------------''-----------------------------------------------' | 57 | * `------------------------------------------------''-----------------------------------------------' |
| 60 | */ | 58 | */ |
| 61 | [_NAV] = KEYMAP( \ | 59 | [_NAV] = LAYOUT( \ |
| 62 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 , \ | 60 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
| 63 | KC_TRNS, RGB_SAI, RGB_VAI, RGB_SAD, RESET, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME , \ | 61 | _______, RGB_SAI, RGB_VAI, RGB_SAD, RESET, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, \ |
| 64 | KC_TRNS, RGB_HUD, RGB_VAD, RGB_HUI, RGB_MOD, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END , \ | 62 | _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_MOD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, \ |
| 65 | KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT , \ | 63 | KC_LSFT, _______, _______, _______, _______, _______, MAGIC_TOGGLE_NKRO, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, \ |
| 66 | KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLU, KC_VOLD \ | 64 | KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD \ |
| 67 | ), | 65 | ), |
| 68 | 66 | ||
| 69 | }; | 67 | }; |
| 70 | 68 | ||
diff --git a/keyboards/zen/keymaps/xyverz/keymap.c b/keyboards/zen/keymaps/xyverz/keymap.c index 2180a7459..8879fbb5f 100644 --- a/keyboards/zen/keymaps/xyverz/keymap.c +++ b/keyboards/zen/keymaps/xyverz/keymap.c | |||
| @@ -16,9 +16,7 @@ TODO: | |||
| 16 | 16 | ||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "zen.h" | 19 | #include QMK_KEYBOARD_H |
| 20 | #include "action_layer.h" | ||
| 21 | #include "eeconfig.h" | ||
| 22 | 20 | ||
| 23 | extern keymap_config_t keymap_config; | 21 | extern keymap_config_t keymap_config; |
| 24 | 22 | ||
| @@ -55,61 +53,61 @@ enum atreus52_keycodes { | |||
| 55 | 53 | ||
| 56 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 54 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 57 | 55 | ||
| 58 | [_DVORAK] = KEYMAP( \ | 56 | [_DVORAK] = LAYOUT( \ |
| 59 | KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, \ | 57 | KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, \ |
| 60 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ | 58 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ |
| 61 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ | 59 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ |
| 62 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ | 60 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ |
| 63 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_SLSH, KC_EQL, RAISE \ | 61 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_SLSH, KC_EQL, RAISE \ |
| 64 | ), | 62 | ), |
| 65 | 63 | ||
| 66 | [_QWERTY] = KEYMAP( \ | 64 | [_QWERTY] = LAYOUT( \ |
| 67 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, \ | 65 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, \ |
| 68 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , \ | 66 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , \ |
| 69 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 67 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 70 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 68 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| 71 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, RAISE \ | 69 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, RAISE \ |
| 72 | ), | 70 | ), |
| 73 | 71 | ||
| 74 | [_COLEMAK] = KEYMAP( \ | 72 | [_COLEMAK] = LAYOUT( \ |
| 75 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, \ | 73 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, \ |
| 76 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL , \ | 74 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL , \ |
| 77 | KC_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ | 75 | KC_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
| 78 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 76 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| 79 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, RAISE \ | 77 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL, RAISE \ |
| 80 | ), | 78 | ), |
| 81 | 79 | ||
| 82 | [_WOW] = KEYMAP( \ | 80 | [_WOW] = LAYOUT( \ |
| 83 | KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, \ | 81 | KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, \ |
| 84 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ | 82 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ |
| 85 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ | 83 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ |
| 86 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ | 84 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ |
| 87 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, CTLBSPC, KC_LALT, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_SLSH, KC_EQL, RAISE \ | 85 | LOWER, KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, CTLBSPC, KC_LALT, KC_ENT, KC_SPC, KC_UP, KC_DOWN, KC_SLSH, KC_EQL, RAISE \ |
| 88 | ), | 86 | ), |
| 89 | 87 | ||
| 90 | [_LOWER] = KEYMAP( \ | 88 | [_LOWER] = LAYOUT( \ |
| 91 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ | 89 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ |
| 92 | KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, \ | 90 | KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, \ |
| 93 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ | 91 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ |
| 94 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \ | 92 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \ |
| 95 | _______, _______, _______, KC_HOME, KC_END, KC_DEL, _______, _______, KC_INS, KC_PGUP, KC_PGDN, _______, _______, _______ \ | 93 | _______, _______, _______, KC_HOME, KC_END, KC_DEL, _______, _______, KC_INS, KC_PGUP, KC_PGDN, _______, _______, _______ \ |
| 96 | ), | 94 | ), |
| 97 | 95 | ||
| 98 | [_RAISE] = KEYMAP( \ | 96 | [_RAISE] = LAYOUT( \ |
| 99 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ | 97 | KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ |
| 100 | KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, \ | 98 | KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, \ |
| 101 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______, \ | 99 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______, \ |
| 102 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \ | 100 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \ |
| 103 | _______, _______, _______, KC_HOME, KC_END, KC_DEL, _______, _______, KC_INS, KC_PGUP, KC_PGDN, _______, _______, _______ \ | 101 | _______, _______, _______, KC_HOME, KC_END, KC_DEL, _______, _______, KC_INS, KC_PGUP, KC_PGDN, _______, _______, _______ \ |
| 104 | ), | 102 | ), |
| 105 | 103 | ||
| 106 | [_ADJUST] = KEYMAP( \ | 104 | [_ADJUST] = LAYOUT( \ |
| 107 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 105 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 108 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 106 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 109 | _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_SNK, _______, QWERTY, COLEMAK, DVORAK, WOW, _______, \ | 107 | _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_SNK, _______, QWERTY, COLEMAK, DVORAK, WOW, _______, \ |
| 110 | RGB_TOG, RGB_MOD, RGB_SWR, RGB_M_K, RGB_M_G, RGB_HUI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, \ | 108 | RGB_TOG, RGB_MOD, RGB_SWR, RGB_M_K, RGB_M_G, RGB_HUI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, \ |
| 111 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | 109 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 112 | ), | 110 | ), |
| 113 | 111 | ||
| 114 | }; | 112 | }; |
| 115 | 113 | ||
diff --git a/keyboards/zen/readme.md b/keyboards/zen/readme.md index 36c63d293..beb5e13ac 100644 --- a/keyboards/zen/readme.md +++ b/keyboards/zen/readme.md | |||
| @@ -1,12 +1,20 @@ | |||
| 1 | Zen Keyboard | 1 | # Zen Keyboard |
| 2 | ==== | ||
| 3 | 2 | ||
| 4 | A split ergo keyboard with a few goals in mind: | 3 | A split ergo keyboard with a few goals in mind: |
| 5 | - Be as thin as possible. Other split KBs (Let's Split, Nyquist, Iris) are 15.2mm thick. The Zen is only 8.0mm thick. | ||
| 6 | - Layout designed for gaming. 1.5u pinky keys, ortho alphas, and angled thumb keys. After trying Ortholiniear, Atreus62, and Ergodox, this is the best layout for gaming and typing. | ||
| 7 | - RGB backlighting. 16 WS2812b LEDs shine through the perimeter switches. The SK6812 variant are cheap and easy to solder. | ||
| 8 | - Price. Using Arduino Pro Micro, SK6812 LEDs, and PCB FR4 for the case, the cost of each half without switches or caps can be reduced to under $20 when purchased at volume. | ||
| 9 | 4 | ||
| 10 | A build guide and more info for this keyboard can be found here: [Zen Build Guide](https://legonut.gitbooks.io/zen-keyboard/content/) | 5 | - Be as thin as possible. Other split KBs (Let's Split, Nyquist, Iris) are 15.2mm thick. The Zen is only 8.0mm thick. |
| 6 | - Layout designed for gaming. 1.5u pinky keys, ortho alphas, and angled thumb keys. After trying Ortholinear, Atreus62, and Ergodox, this is the best layout for gaming and typing. | ||
| 7 | - RGB backlighting. 16 WS2812b LEDs shine through the perimeter switches. The SK6812 variant are cheap and easy to solder. | ||
| 8 | - Price. Using Arduino Pro Micro, SK6812 LEDs, and PCB FR4 for the case, the cost of each half without switches or caps can be reduced to under $20 when purchased at volume. | ||
| 11 | 9 | ||
| 12 | Maintained by u/legonut3 \ No newline at end of file | 10 | Keyboard Maintainer: [Legonut](https://github.com/Legonut) |
| 11 | Hardware Supported: Zen rev1 | ||
| 12 | Hardware Availability: [RGBKB.net](https://www.rgbkb.net/) | ||
| 13 | |||
| 14 | A build guide and more info for this keyboard can be found here: [Zen Build Guide](https://legonut.gitbooks.io/zen-keyboard/content/). | ||
| 15 | |||
| 16 | Make example for this keyboard (after setting up your build environment): | ||
| 17 | |||
| 18 | make zen/rev1:default | ||
| 19 | |||
| 20 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | ||
diff --git a/keyboards/zen/rev1/rev1.h b/keyboards/zen/rev1/rev1.h index 4983bb2a3..c2444f047 100644 --- a/keyboards/zen/rev1/rev1.h +++ b/keyboards/zen/rev1/rev1.h | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | //void promicro_bootloader_jmp(bool program); | 18 | //void promicro_bootloader_jmp(bool program); |
| 19 | 19 | ||
| 20 | #define KEYMAP( \ | 20 | #define LAYOUT( \ |
| 21 | k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ | 21 | k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ |
| 22 | k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ | 22 | k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ |
| 23 | k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ | 23 | k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ |
diff --git a/keyboards/zen/zen.h b/keyboards/zen/zen.h index 4560ff8cd..56fc64fe2 100644 --- a/keyboards/zen/zen.h +++ b/keyboards/zen/zen.h | |||
| @@ -4,20 +4,4 @@ | |||
| 4 | #include "rev1.h" | 4 | #include "rev1.h" |
| 5 | #include "quantum.h" | 5 | #include "quantum.h" |
| 6 | 6 | ||
| 7 | // Used to create a keymap using only KC_ prefixed keys | 7 | #endif |
| 8 | #define KC_KEYMAP( \ | ||
| 9 | L00, L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, R06,\ | ||
| 10 | L10, L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, R16,\ | ||
| 11 | L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26,\ | ||
| 12 | L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36,\ | ||
| 13 | L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ | ||
| 14 | ) \ | ||
| 15 | KEYMAP( \ | ||
| 16 | KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \ | ||
| 17 | KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \ | ||
| 18 | KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \ | ||
| 19 | KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \ | ||
| 20 | KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46, \ | ||
| 21 | ) | ||
| 22 | |||
| 23 | #endif \ No newline at end of file | ||
