diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-12-03 14:07:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 14:07:41 -0800 |
| commit | 138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b (patch) | |
| tree | 88649cb18f904e520115ddaef52901b4da8f7e50 /keyboards/zoo | |
| parent | a5a65fb1e27dcbcdb3e489f1cbde9e7306522693 (diff) | |
| download | qmk_firmware-138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b.tar.gz qmk_firmware-138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b.zip | |
Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)
* Add LAYOUT_alice support: fallacy
* Add LAYOUT_alice support: kb_elmo/sesame
* Add LAYOUT_alice support: cheshire/curiosity
* Add LAYOUT_alice support: evyd13/wonderland
* Add LAYOUT_alice support: mechlovin/adelais
* Update LAYOUT_alice support: projectkb/alice
The PR that added Alice community layout support for the projectkb/alice/rev2 simultaneously broke support for every other keyboard that supported LAYOUT_alice.
This commit partially reverts the offending PR. `LAYOUT_alice` for the projectkb/alice has been renamed to `LAYOUT_alice_split_bs`, and a correct 65-key `LAYOUT_alice` has been added.
Additionally, the `LAYOUTS` rule has been moved to keyboard level as the layout macros are shared between rev1 and rev2 boards, which means the layout options are the same for both revisions.
* Update ramonimbao/aelith info.json
Keyboard source was already correct to support LAYOUT_alice, but the layout tree was missing from info.json.
* Fork `alice` Community Layout...
... into Standard and Split Backspace versions
Also updates stanrc85's layout keymap to use 65 keys instead of the Split Backspace 66-key version.
* Update LAYOUT_alice support: sneakbox/aliceclone
Rework the sneakbox/aliceclone to use the Split Backspace Alice layout.
* Update LAYOUT_alice support: zoo/wampus
The layout macro that was `LAYOUT_alice` was 66 keys. This layout macro has been renamed to `LAYOUT_alice_split_bs`, and a 65-key `LAYOUT_alice` has been added.
Additionally, the 66-key macro has been rearranged to accept its keycodes in the intended order for Community Layout support.
* Update keyboards for `LAYOUT_alice_split_bs` support
* LAYOUT_alice_split_bs support: ergosaurus
* LAYOUT_alice_split_bs support: handwired/colorlice
* LAYOUT_alice(_split_bs) support: handwired/owlet60
* LAYOUT_alice_split_bs support: nightly_boards/alter/rev1
* LAYOUT_alice(_split_bs) support: sck/osa
* LAYOUT_alice_split_bs support: tgr/alice
* LAYOUT_alice(_split_bs) support: tkc/osav2
* LAYOUT_alice_split_bs support: xelus/valor/rev1
Diffstat (limited to 'keyboards/zoo')
| -rw-r--r-- | keyboards/zoo/wampus/info.json | 75 | ||||
| -rw-r--r-- | keyboards/zoo/wampus/keymaps/default/keymap.c | 24 | ||||
| -rw-r--r-- | keyboards/zoo/wampus/keymaps/via/keymap.c | 36 | ||||
| -rw-r--r-- | keyboards/zoo/wampus/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/zoo/wampus/wampus.h | 26 |
5 files changed, 125 insertions, 38 deletions
diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 5353a094e..283d36673 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 19.75, | 5 | "width": 19.75, |
| 6 | "height": 5.25, | 6 | "height": 5.25, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_alice": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"label":"Esc", "x":0.5, "y":0}, | 10 | {"label":"Esc", "x":0.5, "y":0}, |
| 11 | {"label":"`", "x":1.75, "y":0.25}, | 11 | {"label":"`", "x":1.75, "y":0.25}, |
| @@ -78,6 +78,79 @@ | |||
| 78 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | 78 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, |
| 79 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | 79 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} |
| 80 | ] | 80 | ] |
| 81 | }, | ||
| 82 | "LAYOUT_alice": { | ||
| 83 | "layout": [ | ||
| 84 | {"label":"Esc", "x":0.5, "y":0}, | ||
| 85 | {"label":"`", "x":1.75, "y":0.25}, | ||
| 86 | {"label":"1", "x":2.75, "y":0.25}, | ||
| 87 | {"label":"2", "x":3.75, "y":0}, | ||
| 88 | {"label":"3", "x":4.75, "y":0.25}, | ||
| 89 | {"label":"4", "x":5.75, "y":0.25}, | ||
| 90 | {"label":"5", "x":6.75, "y":0.25}, | ||
| 91 | {"label":"6", "x":7.75, "y":0.25}, | ||
| 92 | {"label":"7", "x":11, "y":0.25}, | ||
| 93 | {"label":"8", "x":12, "y":0.25}, | ||
| 94 | {"label":"9", "x":13, "y":0.25}, | ||
| 95 | {"label":"0", "x":14, "y":0.25}, | ||
| 96 | {"label":"-", "x":15, "y":0}, | ||
| 97 | {"label":"=", "x":16, "y":0.25}, | ||
| 98 | {"label":"Backspace", "x":17, "y":0.25, "w":2}, | ||
| 99 | |||
| 100 | {"label":"PgUp", "x":0.25, "y":1}, | ||
| 101 | {"label":"Tab", "x":1.5, "y":1.25, "w":1.5}, | ||
| 102 | {"label":"Q", "x":3, "y":1.25}, | ||
| 103 | {"label":"W", "x":4.25, "y":1.25}, | ||
| 104 | {"label":"E", "x":5.25, "y":1.25}, | ||
| 105 | {"label":"R", "x":6.25, "y":1.25}, | ||
| 106 | {"label":"T", "x":7.25, "y":1.25}, | ||
| 107 | {"label":"Y", "x":10.5, "y":1.25}, | ||
| 108 | {"label":"U", "x":11.5, "y":1.25}, | ||
| 109 | {"label":"I", "x":12.5, "y":1.25}, | ||
| 110 | {"label":"O", "x":13.5, "y":1.25}, | ||
| 111 | {"label":"P", "x":14.75, "y":1.25}, | ||
| 112 | {"label":"{", "x":15.75, "y":1.25}, | ||
| 113 | {"label":"}", "x":16.75, "y":1.25}, | ||
| 114 | {"label":"|", "x":17.75, "y":1.25, "w":1.5}, | ||
| 115 | |||
| 116 | {"label":"PgDn", "x":0, "y":2}, | ||
| 117 | {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75}, | ||
| 118 | {"label":"A", "x":3.25, "y":2.25}, | ||
| 119 | {"label":"S", "x":4.5, "y":2.25}, | ||
| 120 | {"label":"D", "x":5.5, "y":2.25}, | ||
| 121 | {"label":"F", "x":6.5, "y":2.25}, | ||
| 122 | {"label":"G", "x":7.5, "y":2.25}, | ||
| 123 | {"label":"H", "x":10.75, "y":2.25}, | ||
| 124 | {"label":"J", "x":11.75, "y":2.25}, | ||
| 125 | {"label":"K", "x":12.75, "y":2.25}, | ||
| 126 | {"label":"L", "x":13.75, "y":2.25}, | ||
| 127 | {"label":":", "x":15.25, "y":2.25}, | ||
| 128 | {"label":"\"", "x":16.25, "y":2.25}, | ||
| 129 | {"label":"Enter", "x":17.25, "y":2.25, "w":2.25}, | ||
| 130 | |||
| 131 | {"label":"Shift", "x":1.5, "y":3.25, "w":2.25}, | ||
| 132 | {"label":"Z", "x":3.75, "y":3.25}, | ||
| 133 | {"label":"X", "x":5, "y":3.25}, | ||
| 134 | {"label":"C", "x":6, "y":3.25}, | ||
| 135 | {"label":"V", "x":7, "y":3.25}, | ||
| 136 | {"label":"B", "x":8, "y":3.25}, | ||
| 137 | {"label":"Fn", "x":10.25, "y":3.25}, | ||
| 138 | {"label":"N", "x":11.25, "y":3.25}, | ||
| 139 | {"label":"M", "x":12.25, "y":3.25}, | ||
| 140 | {"label":"<", "x":13.25, "y":3.25}, | ||
| 141 | {"label":">", "x":15, "y":3.25}, | ||
| 142 | {"label":"?", "x":16, "y":3.25}, | ||
| 143 | {"label":"Shift", "x":17, "y":3.25, "w":1.75}, | ||
| 144 | {"label":"Fn", "x":18.75, "y":3.25}, | ||
| 145 | |||
| 146 | {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5}, | ||
| 147 | {"label":"Alt", "x":5, "y":4.25, "w":1.5}, | ||
| 148 | {"label":"Space", "x":6.5, "y":4.25, "w":2}, | ||
| 149 | {"label":"Menu", "x":8.5, "y":4.25}, | ||
| 150 | {"label":"Space", "x":10.25, "y":4.25, "w":2.75}, | ||
| 151 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | ||
| 152 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | ||
| 153 | ] | ||
| 81 | } | 154 | } |
| 82 | } | 155 | } |
| 83 | } | 156 | } |
diff --git a/keyboards/zoo/wampus/keymaps/default/keymap.c b/keyboards/zoo/wampus/keymaps/default/keymap.c index 0c3a6d0c3..83d49b0ef 100644 --- a/keyboards/zoo/wampus/keymaps/default/keymap.c +++ b/keyboards/zoo/wampus/keymaps/default/keymap.c | |||
| @@ -16,18 +16,18 @@ | |||
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | [0] = LAYOUT_alice( | 19 | [0] = LAYOUT_alice_split_bs( |
| 20 | KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC, KC_DEL, | 20 | KC_ESC, KC_TILD, 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_DEL, |
| 21 | KC_ESC, 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_BSLASH, | 21 | KC_PGUP, 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, |
| 22 | KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENT, | 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 23 | KC_PGDN, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_RSFT, KC_RGUI, | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGUI, |
| 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL | 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT_alice( | 26 | [1] = LAYOUT_alice_split_bs( |
| 27 | KC_TRNS, 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, KC_TRNS, | 27 | RGB_TOG, KC_TRNS, 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, KC_TRNS, |
| 28 | RGB_TOG, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 28 | RGB_MOD, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 29 | RGB_MOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 29 | RGB_RMOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 30 | RGB_RMOD, 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, | 30 | 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, |
| 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 32 | ), | 32 | ), |
| 33 | }; | 33 | }; |
diff --git a/keyboards/zoo/wampus/keymaps/via/keymap.c b/keyboards/zoo/wampus/keymaps/via/keymap.c index 2126be5e9..b9620c67b 100644 --- a/keyboards/zoo/wampus/keymaps/via/keymap.c +++ b/keyboards/zoo/wampus/keymaps/via/keymap.c | |||
| @@ -16,32 +16,32 @@ | |||
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | [0] = LAYOUT_alice( | 19 | [0] = LAYOUT_alice_split_bs( |
| 20 | KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC, KC_DEL, | 20 | KC_ESC, KC_TILD, 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_DEL, |
| 21 | KC_ESC, 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_BSLASH, | 21 | KC_PGUP, 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, |
| 22 | KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENT, | 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 23 | KC_PGDN, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_RSFT, KC_RGUI, | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGUI, |
| 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL | 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT_alice( | 26 | [1] = LAYOUT_alice_split_bs( |
| 27 | KC_TRNS, 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, KC_TRNS, | 27 | RGB_TOG, KC_TRNS, 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, KC_TRNS, |
| 28 | RGB_TOG, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 28 | RGB_MOD, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 29 | RGB_MOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 29 | RGB_RMOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 30 | RGB_RMOD, 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, | 30 | 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, |
| 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 32 | ), | 32 | ), |
| 33 | [2] = LAYOUT_alice( | 33 | [2] = LAYOUT_alice_split_bs( |
| 34 | 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, | 34 | 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, |
| 35 | 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, | 35 | 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, |
| 36 | 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, | 36 | 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, |
| 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, KC_TRNS, | 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 | 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 39 | ), | 39 | ), |
| 40 | [3] = LAYOUT_alice( | 40 | [3] = LAYOUT_alice_split_bs( |
| 41 | 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, | 41 | 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, |
| 42 | 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, | 42 | 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, |
| 43 | 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, | 43 | 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, |
| 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, KC_TRNS, | 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 | 45 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 46 | ) | 46 | ) |
| 47 | }; | 47 | }; |
diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk index 9b587fe31..889e4d858 100644 --- a/keyboards/zoo/wampus/rules.mk +++ b/keyboards/zoo/wampus/rules.mk | |||
| @@ -23,4 +23,4 @@ OLED_DRIVER_ENABLE = no # Enables the use of OLED displays | |||
| 23 | # Enter lower-power sleep mode when on the ChibiOS idle thread | 23 | # Enter lower-power sleep mode when on the ChibiOS idle thread |
| 24 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE | 24 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |
| 25 | 25 | ||
| 26 | LAYOUTS = alice | 26 | LAYOUTS = alice alice_split_bs |
diff --git a/keyboards/zoo/wampus/wampus.h b/keyboards/zoo/wampus/wampus.h index a5cdeaf01..f74b58b51 100644 --- a/keyboards/zoo/wampus/wampus.h +++ b/keyboards/zoo/wampus/wampus.h | |||
| @@ -20,12 +20,12 @@ | |||
| 20 | 20 | ||
| 21 | #define ____ KC_NO | 21 | #define ____ KC_NO |
| 22 | 22 | ||
| 23 | #define LAYOUT_alice( \ | 23 | #define LAYOUT_alice_split_bs( \ |
| 24 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ | 24 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ |
| 25 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | 25 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ |
| 26 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ | 26 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ |
| 27 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ | 27 | K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ |
| 28 | K401, K403, K405, K406, K408, K410, K414 \ | 28 | K401, K403, K405, K406, K408, K410, K414 \ |
| 29 | ) { \ | 29 | ) { \ |
| 30 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \ | 30 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \ |
| 31 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ | 31 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ |
| @@ -33,3 +33,17 @@ | |||
| 33 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \ | 33 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \ |
| 34 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \ | 34 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \ |
| 35 | } | 35 | } |
| 36 | |||
| 37 | #define LAYOUT_alice( \ | ||
| 38 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ | ||
| 39 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | ||
| 40 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ | ||
| 41 | K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ | ||
| 42 | K401, K403, K405, K406, K408, K410, K414 \ | ||
| 43 | ) { \ | ||
| 44 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, }, \ | ||
| 45 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ | ||
| 46 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \ | ||
| 47 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \ | ||
| 48 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \ | ||
| 49 | } | ||
