diff options
Diffstat (limited to 'keyboards/mechwild/mokulua/standard')
| -rw-r--r-- | keyboards/mechwild/mokulua/standard/info.json | 152 | ||||
| -rw-r--r-- | keyboards/mechwild/mokulua/standard/standard.c | 2 | ||||
| -rw-r--r-- | keyboards/mechwild/mokulua/standard/standard.h | 31 |
3 files changed, 81 insertions, 104 deletions
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index 18594c39ed..4ab38d9d37 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -26,84 +26,92 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT_standard": "LAYOUT" + }, "layouts": { - "LAYOUT_standard": { + "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.62, "y":0}, - {"label":"1!", "x":1.62, "y":0}, - {"label":"2@", "x":2.62, "y":0}, - {"label":"3#", "x":3.62, "y":0}, - {"label":"4$", "x":4.62, "y":0}, - {"label":"5%", "x":5.62, "y":0}, - {"label":"6^", "x":6.62, "y":0}, - {"label":"7&", "x":9.62, "y":0}, - {"label":"8*", "x":10.62, "y":0}, - {"label":"9(", "x":11.62, "y":0}, - {"label":"0)", "x":12.62, "y":0}, - {"label":"-_", "x":13.62, "y":0}, - {"label":"Backspace", "x":14.62, "y":0}, - {"label":"Backspace", "x":15.62, "y":0}, + {"matrix": [0, 0], "x": 0.62, "y": 0}, + {"matrix": [0, 1], "x": 1.62, "y": 0}, + {"matrix": [0, 2], "x": 2.62, "y": 0}, + {"matrix": [0, 3], "x": 3.62, "y": 0}, + {"matrix": [0, 4], "x": 4.62, "y": 0}, + {"matrix": [0, 5], "x": 5.62, "y": 0}, + {"matrix": [5, 5], "x": 6.62, "y": 0}, + + {"matrix": [11, 0], "x": 9.62, "y": 0}, + {"matrix": [6, 0], "x": 10.62, "y": 0}, + {"matrix": [6, 1], "x": 11.62, "y": 0}, + {"matrix": [6, 2], "x": 12.62, "y": 0}, + {"matrix": [6, 3], "x": 13.62, "y": 0}, + {"matrix": [6, 4], "x": 14.62, "y": 0}, + {"matrix": [6, 5], "x": 15.62, "y": 0}, + + {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.87, "y": 1}, + {"matrix": [1, 2], "x": 2.87, "y": 1}, + {"matrix": [1, 3], "x": 3.87, "y": 1}, + {"matrix": [1, 4], "x": 4.87, "y": 1}, + {"matrix": [1, 5], "x": 5.87, "y": 1}, + {"matrix": [5, 4], "x": 6.87, "y": 1}, + + {"matrix": [7, 0], "x": 10.37, "y": 1}, + {"matrix": [7, 1], "x": 11.37, "y": 1}, + {"matrix": [7, 2], "x": 12.37, "y": 1}, + {"matrix": [7, 3], "x": 13.37, "y": 1}, + {"matrix": [7, 4], "x": 14.37, "y": 1}, + {"matrix": [7, 5], "x": 15.37, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + + {"matrix": [11, 1], "x": 9.75, "y": 2}, + {"matrix": [8, 0], "x": 10.75, "y": 2}, + {"matrix": [8, 1], "x": 11.75, "y": 2}, + {"matrix": [8, 2], "x": 12.75, "y": 2}, + {"matrix": [8, 3], "x": 13.75, "y": 2}, + {"matrix": [8, 4], "x": 14.75, "y": 2}, + {"matrix": [8, 5], "x": 15.75, "y": 2, "w": 1.75}, - {"label":"Tab", "x":0.37, "y":1, "w":1.5}, - {"label":"Q", "x":1.87, "y":1}, - {"label":"W", "x":2.87, "y":1}, - {"label":"E", "x":3.87, "y":1}, - {"label":"R", "x":4.87, "y":1}, - {"label":"T", "x":5.87, "y":1}, - {"label":"Y", "x":6.87, "y":1}, - {"label":"U", "x":10.37, "y":1}, - {"label":"I", "x":11.37, "y":1}, - {"label":"O", "x":12.37, "y":1}, - {"label":"P", "x":13.37, "y":1}, - {"label":"]}", "x":14.37, "y":1}, - {"label":"\\|", "x":15.37, "y":1, "w":1.5}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [5, 1], "x": 6.25, "y": 3}, + {"matrix": [5, 2], "x": 7.37, "y": 3}, - {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":3, "y":2}, - {"label":"D", "x":4, "y":2}, - {"label":"F", "x":5, "y":2}, - {"label":"G", "x":6, "y":2}, - {"label":"H", "x":7, "y":2}, - {"label":";:", "x":9.75, "y":2}, - {"label":"H", "x":10.75, "y":2}, - {"label":"J", "x":11.75, "y":2}, - {"label":"K", "x":12.75, "y":2}, - {"label":"L", "x":13.75, "y":2}, - {"label":"'\"", "x":14.75, "y":2}, - {"label":"Enter", "x":15.75, "y":2, "w":1.75}, + {"matrix": [11, 3], "x": 9.37, "y": 3}, + {"matrix": [11, 2], "x": 10.5, "y": 3}, + {"matrix": [9, 0], "x": 11.5, "y": 3}, + {"matrix": [9, 1], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 3], "x": 14.5, "y": 3}, + {"matrix": [9, 4], "x": 15.5, "y": 3}, + {"matrix": [9, 5], "x": 16.5, "y": 3, "w": 1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"\\|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"Mute", "x":7.37, "y":3}, - {"label":"Mute", "x":9.37, "y":3}, - {"label":"B", "x":10.5, "y":3}, - {"label":"N", "x":11.5, "y":3}, - {"label":"M", "x":12.5, "y":3}, - {"label":",<", "x":13.5, "y":3}, - {"label":".>", "x":14.5, "y":3}, - {"label":"\u2191", "x":15.5, "y":3}, - {"label":"Shift", "x":16.5, "y":3, "w":1.25}, + {"matrix": [4, 0], "x": 0.25, "y": 4}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5}, + {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5}, + {"matrix": [5, 0], "x": 7.13, "y": 4}, - {"label":"Ctrl", "x":0.25, "y":4}, - {"label":"GUI", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4}, - {"label":"Fn2", "x":3.5, "y":4, "w":1.25}, - {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5}, - {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5}, - {"label":"RGB Mode -", "x":7.13, "y":4}, - {"label":"RGB Mode +", "x":9.62, "y":4}, - {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5}, - {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5}, - {"label":"Fn2", "x":13, "y":4, "w":1.25}, - {"label":"\u2190", "x":14.5, "y":4}, - {"label":"\u2193", "x":15.5, "y":4}, - {"label":"\u2192", "x":16.5, "y":4} + {"matrix": [11, 4], "x": 9.62, "y": 4}, + {"matrix": [10, 0], "x": 10.81, "y": 4, "h": 1.5}, + {"matrix": [10, 1], "x": 11.81, "y": 4, "h": 1.5}, + {"matrix": [10, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 14.5, "y": 4}, + {"matrix": [10, 4], "x": 15.5, "y": 4}, + {"matrix": [10, 5], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/mechwild/mokulua/standard/standard.c b/keyboards/mechwild/mokulua/standard/standard.c index 4bccb70e3f..434b71560c 100644 --- a/keyboards/mechwild/mokulua/standard/standard.c +++ b/keyboards/mechwild/mokulua/standard/standard.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@Kyle McCreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "standard.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/mechwild/mokulua/standard/standard.h b/keyboards/mechwild/mokulua/standard/standard.h deleted file mode 100644 index 0484340e8d..0000000000 --- a/keyboards/mechwild/mokulua/standard/standard.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_standard( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R01, R02, R03, R04, R05, R06 }, \ - { R11, R12, R13, R14, R15, R16 }, \ - { R21, R22, R23, R24, R25, R26 }, \ - { R32, R33, R34, R35, R36, R37 }, \ - { R41, R42, R43, R44, R45, R46 }, \ - { R00, R20, R31, R30, R40, ___ } \ -} - -#define LAYOUT LAYOUT_standard |