diff options
Diffstat (limited to 'keyboards/kiwikey')
-rw-r--r-- | keyboards/kiwikey/wanderland/info.json | 290 | ||||
-rw-r--r-- | keyboards/kiwikey/wanderland/wanderland.h | 77 |
2 files changed, 157 insertions, 210 deletions
diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json index 3489d64245..a220d57687 100644 --- a/keyboards/kiwikey/wanderland/info.json +++ b/keyboards/kiwikey/wanderland/info.json @@ -27,143 +27,167 @@ "layouts": { "LAYOUT_alice_split_bs": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"~", "x":1.25, "y":0}, - {"label":"!", "x":2.25, "y":0}, - {"label":"@", "x":3.25, "y":0}, - {"label":"#", "x":4.25, "y":0}, - {"label":"$", "x":5.25, "y":0}, - {"label":"%", "x":6.25, "y":0}, - {"label":"^", "x":7.25, "y":0}, - {"label":"&", "x":10.25, "y":0}, - {"label":"*", "x":11.25, "y":0}, - {"label":"(", "x":12.25, "y":0}, - {"label":")", "x":13.25, "y":0}, - {"label":"_", "x":14.25, "y":0}, - {"label":"+", "x":15.25, "y":0}, - {"label":"Backspace", "x":16.25, "y":0}, - {"label":"Del", "x":17.25, "y":0}, - {"label":"Mute", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":9.75, "y":1}, - {"label":"U", "x":10.75, "y":1}, - {"label":"I", "x":11.75, "y":1}, - {"label":"O", "x":12.75, "y":1}, - {"label":"P", "x":13.75, "y":1}, - {"label":"{", "x":14.75, "y":1}, - {"label":"}", "x":15.75, "y":1}, - {"label":"|", "x":16.75, "y":1, "w":1.5}, - {"label":"Vol-", "x":0, "y":2}, - {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, - {"label":"A", "x":3, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":10, "y":2}, - {"label":"J", "x":11, "y":2}, - {"label":"K", "x":12, "y":2}, - {"label":"L", "x":13, "y":2}, - {"label":":", "x":14, "y":2}, - {"label":"\"", "x":15, "y":2}, - {"label":"Enter", "x":16, "y":2, "w":2.25}, - {"label":"Vol+", "x":0, "y":3}, - {"label":"Shift", "x":1.25, "y":3, "w":2.25}, - {"label":"Z", "x":3.5, "y":3}, - {"label":"X", "x":4.5, "y":3}, - {"label":"C", "x":5.5, "y":3}, - {"label":"V", "x":6.5, "y":3}, - {"label":"B", "x":7.5, "y":3}, - {"label":"B", "x":9.5, "y":3}, - {"label":"N", "x":10.5, "y":3}, - {"label":"M", "x":11.5, "y":3}, - {"label":"<", "x":12.5, "y":3}, - {"label":">", "x":13.5, "y":3}, - {"label":"?", "x":14.5, "y":3}, - {"label":"Shift", "x":15.5, "y":3, "w":1.75}, - {"label":"Win", "x":17.25, "y":3}, - {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, - {"label":"Alt", "x":4.25, "y":4, "w":1.25}, - {"label":"Space", "x":5.5, "y":4, "w":2.25}, - {"label":"FN", "x":7.75, "y":4, "w":1.25}, - {"label":"Space", "x":9.5, "y":4, "w":2.75}, - {"label":"Alt", "x":12.25, "y":4, "w":1.5}, - {"label":"Ctrl", "x":16.75, "y":4, "w":1.5} + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [1, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 2], "x": 3.25, "y": 0}, + {"matrix": [1, 3], "x": 4.25, "y": 0}, + {"matrix": [1, 4], "x": 5.25, "y": 0}, + {"matrix": [1, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 5], "x": 7.25, "y": 0}, + + {"matrix": [0, 6], "x": 10.25, "y": 0}, + {"matrix": [1, 6], "x": 11.25, "y": 0}, + {"matrix": [1, 7], "x": 12.25, "y": 0}, + {"matrix": [1, 8], "x": 13.25, "y": 0}, + {"matrix": [1, 9], "x": 14.25, "y": 0}, + {"matrix": [1, 10], "x": 15.25, "y": 0}, + {"matrix": [1, 11], "x": 16.25, "y": 0}, + {"matrix": [1, 12], "x": 17.25, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + + {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 2.75, "y": 1}, + {"matrix": [2, 2], "x": 3.75, "y": 1}, + {"matrix": [2, 3], "x": 4.75, "y": 1}, + {"matrix": [2, 4], "x": 5.75, "y": 1}, + {"matrix": [2, 5], "x": 6.75, "y": 1}, + {"matrix": [0, 7], "x": 9.75, "y": 1}, + + {"matrix": [2, 6], "x": 10.75, "y": 1}, + {"matrix": [2, 7], "x": 11.75, "y": 1}, + {"matrix": [2, 8], "x": 12.75, "y": 1}, + {"matrix": [2, 9], "x": 13.75, "y": 1}, + {"matrix": [2, 10], "x": 14.75, "y": 1}, + {"matrix": [2, 11], "x": 15.75, "y": 1}, + {"matrix": [2, 12], "x": 16.75, "y": 1, "w": 1.5}, + + {"matrix": [0, 0], "x": 0, "y": 2}, + + {"matrix": [3, 0], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [3, 1], "x": 3, "y": 2}, + {"matrix": [3, 2], "x": 4, "y": 2}, + {"matrix": [3, 3], "x": 5, "y": 2}, + {"matrix": [3, 4], "x": 6, "y": 2}, + {"matrix": [3, 5], "x": 7, "y": 2}, + + {"matrix": [3, 6], "x": 10, "y": 2}, + {"matrix": [3, 7], "x": 11, "y": 2}, + {"matrix": [3, 8], "x": 12, "y": 2}, + {"matrix": [3, 9], "x": 13, "y": 2}, + {"matrix": [3, 10], "x": 14, "y": 2}, + {"matrix": [3, 11], "x": 15, "y": 2}, + {"matrix": [3, 12], "x": 16, "y": 2, "w": 2.25}, + + {"matrix": [0, 3], "x": 0, "y": 3}, + + {"matrix": [4, 0], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [4, 1], "x": 3.5, "y": 3}, + {"matrix": [4, 2], "x": 4.5, "y": 3}, + {"matrix": [4, 3], "x": 5.5, "y": 3}, + {"matrix": [4, 4], "x": 6.5, "y": 3}, + {"matrix": [4, 5], "x": 7.5, "y": 3}, + + {"matrix": [4, 6], "x": 9.5, "y": 3}, + {"matrix": [4, 7], "x": 10.5, "y": 3}, + {"matrix": [4, 8], "x": 11.5, "y": 3}, + {"matrix": [4, 9], "x": 12.5, "y": 3}, + {"matrix": [4, 10], "x": 13.5, "y": 3}, + {"matrix": [4, 11], "x": 14.5, "y": 3}, + {"matrix": [5, 11], "x": 15.5, "y": 3, "w": 1.75}, + {"matrix": [4, 12], "x": 17.25, "y": 3}, + + {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [5, 2], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [5, 3], "x": 5.5, "y": 4, "w": 2.25}, + {"matrix": [5, 5], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [5, 7], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [5, 9], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [5, 12], "x": 16.75, "y": 4, "w": 1.5} ] }, "LAYOUT_alice": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"~", "x":1.25, "y":0}, - {"label":"!", "x":2.25, "y":0}, - {"label":"@", "x":3.25, "y":0}, - {"label":"#", "x":4.25, "y":0}, - {"label":"$", "x":5.25, "y":0}, - {"label":"%", "x":6.25, "y":0}, - {"label":"^", "x":7.25, "y":0}, - {"label":"&", "x":10.25, "y":0}, - {"label":"*", "x":11.25, "y":0}, - {"label":"(", "x":12.25, "y":0}, - {"label":")", "x":13.25, "y":0}, - {"label":"_", "x":14.25, "y":0}, - {"label":"+", "x":15.25, "y":0}, - {"label":"Backspace", "x":16.25, "y":0, "w":2}, - {"label":"Mute", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":9.75, "y":1}, - {"label":"U", "x":10.75, "y":1}, - {"label":"I", "x":11.75, "y":1}, - {"label":"O", "x":12.75, "y":1}, - {"label":"P", "x":13.75, "y":1}, - {"label":"{", "x":14.75, "y":1}, - {"label":"}", "x":15.75, "y":1}, - {"label":"|", "x":16.75, "y":1, "w":1.5}, - {"label":"Vol-", "x":0, "y":2}, - {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, - {"label":"A", "x":3, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":10, "y":2}, - {"label":"J", "x":11, "y":2}, - {"label":"K", "x":12, "y":2}, - {"label":"L", "x":13, "y":2}, - {"label":":", "x":14, "y":2}, - {"label":"\"", "x":15, "y":2}, - {"label":"Enter", "x":16, "y":2, "w":2.25}, - {"label":"Vol+", "x":0, "y":3}, - {"label":"Shift", "x":1.25, "y":3, "w":2.25}, - {"label":"Z", "x":3.5, "y":3}, - {"label":"X", "x":4.5, "y":3}, - {"label":"C", "x":5.5, "y":3}, - {"label":"V", "x":6.5, "y":3}, - {"label":"B", "x":7.5, "y":3}, - {"label":"B", "x":9.5, "y":3}, - {"label":"N", "x":10.5, "y":3}, - {"label":"M", "x":11.5, "y":3}, - {"label":"<", "x":12.5, "y":3}, - {"label":">", "x":13.5, "y":3}, - {"label":"?", "x":14.5, "y":3}, - {"label":"Shift", "x":15.5, "y":3, "w":1.75}, - {"label":"Win", "x":17.25, "y":3}, - {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, - {"label":"Alt", "x":4.25, "y":4, "w":1.25}, - {"label":"Space", "x":5.5, "y":4, "w":2.25}, - {"label":"FN", "x":7.75, "y":4, "w":1.25}, - {"label":"Space", "x":9.5, "y":4, "w":2.75}, - {"label":"Alt", "x":12.25, "y":4, "w":1.5}, - {"label":"Ctrl", "x":16.75, "y":4, "w":1.5} + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [1, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 2], "x": 3.25, "y": 0}, + {"matrix": [1, 3], "x": 4.25, "y": 0}, + {"matrix": [1, 4], "x": 5.25, "y": 0}, + {"matrix": [1, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 5], "x": 7.25, "y": 0}, + + {"matrix": [0, 6], "x": 10.25, "y": 0}, + {"matrix": [1, 6], "x": 11.25, "y": 0}, + {"matrix": [1, 7], "x": 12.25, "y": 0}, + {"matrix": [1, 8], "x": 13.25, "y": 0}, + {"matrix": [1, 9], "x": 14.25, "y": 0}, + {"matrix": [1, 10], "x": 15.25, "y": 0}, + {"matrix": [1, 11], "x": 16.25, "y": 0, "w": 2}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + + {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 2.75, "y": 1}, + {"matrix": [2, 2], "x": 3.75, "y": 1}, + {"matrix": [2, 3], "x": 4.75, "y": 1}, + {"matrix": [2, 4], "x": 5.75, "y": 1}, + {"matrix": [2, 5], "x": 6.75, "y": 1}, + + {"matrix": [0, 7], "x": 9.75, "y": 1}, + {"matrix": [2, 6], "x": 10.75, "y": 1}, + {"matrix": [2, 7], "x": 11.75, "y": 1}, + {"matrix": [2, 8], "x": 12.75, "y": 1}, + {"matrix": [2, 9], "x": 13.75, "y": 1}, + {"matrix": [2, 10], "x": 14.75, "y": 1}, + {"matrix": [2, 11], "x": 15.75, "y": 1}, + {"matrix": [2, 12], "x": 16.75, "y": 1, "w": 1.5}, + + {"matrix": [0, 0], "x": 0, "y": 2}, + + {"matrix": [3, 0], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [3, 1], "x": 3, "y": 2}, + {"matrix": [3, 2], "x": 4, "y": 2}, + {"matrix": [3, 3], "x": 5, "y": 2}, + {"matrix": [3, 4], "x": 6, "y": 2}, + {"matrix": [3, 5], "x": 7, "y": 2}, + + {"matrix": [3, 6], "x": 10, "y": 2}, + {"matrix": [3, 7], "x": 11, "y": 2}, + {"matrix": [3, 8], "x": 12, "y": 2}, + {"matrix": [3, 9], "x": 13, "y": 2}, + {"matrix": [3, 10], "x": 14, "y": 2}, + {"matrix": [3, 11], "x": 15, "y": 2}, + {"matrix": [3, 12], "x": 16, "y": 2, "w": 2.25}, + + {"matrix": [0, 3], "x": 0, "y": 3}, + + {"matrix": [4, 0], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [4, 1], "x": 3.5, "y": 3}, + {"matrix": [4, 2], "x": 4.5, "y": 3}, + {"matrix": [4, 3], "x": 5.5, "y": 3}, + {"matrix": [4, 4], "x": 6.5, "y": 3}, + {"matrix": [4, 5], "x": 7.5, "y": 3}, + + {"matrix": [4, 6], "x": 9.5, "y": 3}, + {"matrix": [4, 7], "x": 10.5, "y": 3}, + {"matrix": [4, 8], "x": 11.5, "y": 3}, + {"matrix": [4, 9], "x": 12.5, "y": 3}, + {"matrix": [4, 10], "x": 13.5, "y": 3}, + {"matrix": [4, 11], "x": 14.5, "y": 3}, + {"matrix": [5, 11], "x": 15.5, "y": 3, "w": 1.75}, + {"matrix": [4, 12], "x": 17.25, "y": 3}, + + {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [5, 2], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [5, 3], "x": 5.5, "y": 4, "w": 2.25}, + {"matrix": [5, 5], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [5, 7], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [5, 9], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [5, 12], "x": 16.75, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/kiwikey/wanderland/wanderland.h b/keyboards/kiwikey/wanderland/wanderland.h deleted file mode 100644 index f207d01d6c..0000000000 --- a/keyboards/kiwikey/wanderland/wanderland.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2021 KiwiKey - * - * 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/>. - */ - -#pragma once - -#include "quantum.h" - -/* Layout Alice split-backspace - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │02 │ │10 │11 │12 │13 │14 │15 │05 │ │06 │16 │17 │18 │19 │1A │1B │1C │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │01 │ │ 20 │21 │22 │23 │24 │25 │ │07 │26 │27 │28 │29 │2A │2B │ 2C │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │00 │ │ 30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │ 3C │ - * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │03 │ │ 40 │41 │42 │43 │44 │45 │ │46 │47 │48 │49 │4A │4B │ 5B │4C │ - * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - * │ 50 │ │ 52 │ 53 │ 55 │ │ 57 │ 59 │ │ 5C │ - * └──────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ - */ -#define LAYOUT_alice_split_bs( \ - k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B, k1C, \ - k01, k20, k21, k22, k23, k24, k25, k07, k26, k27, k28, k29, k2A, k2B, k2C, \ - k00, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ - k03, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k5B, k4C, \ - k50, k52, k53, k55, k57, k59, k5C \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO, k05, k06, k07, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C }, \ - { k50, KC_NO, k52, k53, KC_NO, k55, KC_NO, k57, KC_NO, k59, KC_NO, k5B, k5C } \ -} - -/* Layout Alice - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ - * │02 │ │10 │11 │12 │13 │14 │15 │05 │ │06 │16 │17 │18 │19 │1A │ 1B │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │01 │ │ 20 │21 │22 │23 │24 │25 │ │07 │26 │27 │28 │29 │2A │2B │ 2C │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │00 │ │ 30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │ 3C │ - * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │03 │ │ 40 │41 │42 │43 │44 │45 │ │46 │47 │48 │49 │4A │4B │ 5B │4C │ - * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - * │ 50 │ │ 52 │ 53 │ 55 │ │ 57 │ 59 │ │ 5C │ - * └──────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ - */ -#define LAYOUT_alice( \ - k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B, \ - k01, k20, k21, k22, k23, k24, k25, k07, k26, k27, k28, k29, k2A, k2B, k2C, \ - k00, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ - k03, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k5B, k4C, \ - k50, k52, k53, k55, k57, k59, k5C \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO, k05, k06, k07, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C }, \ - { k50, KC_NO, k52, k53, KC_NO, k55, KC_NO, k57, KC_NO, k59, KC_NO, k5B, k5C } \ -} |