diff options
Diffstat (limited to 'keyboards/takashicompany')
20 files changed, 428 insertions, 1516 deletions
diff --git a/keyboards/takashicompany/center_enter/center_enter.h b/keyboards/takashicompany/center_enter/center_enter.h deleted file mode 100644 index 0bd576f432..0000000000 --- a/keyboards/takashicompany/center_enter/center_enter.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b \ -) { \ - { k00, k01, k02, k03, k04, k05, KC_NO, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b } \ -} diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index e7930bdb01..3521b24218 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -26,43 +26,43 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0, "w":1.5}, - {"label":"Q", "x":1.5, "y":0}, - {"label":"W", "x":2.5, "y":0}, - {"label":"E", "x":3.5, "y":0}, - {"label":"R", "x":4.5, "y":0}, - {"label":"T", "x":5.5, "y":0}, - {"label":"Y", "x":8, "y":0}, - {"label":"U", "x":9, "y":0}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0}, - {"label":"P", "x":12, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, - {"label":"Ctrl", "x":0, "y":1, "w":1.75}, - {"label":"A", "x":1.75, "y":1}, - {"label":"S", "x":2.75, "y":1}, - {"label":"D", "x":3.75, "y":1}, - {"label":"F", "x":4.75, "y":1}, - {"label":"G", "x":5.75, "y":1}, - {"label":"Switch Language", "x":6.75, "y":0, "w":1.25, "h":2}, - {"label":"H", "x":8, "y":1}, - {"label":"J", "x":9, "y":1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1}, - {"label":"Enter", "x":12, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 0, "w": 1.25, "h": 2}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, - {"label":"Shift", "x":0, "y":2, "w":2}, - {"label":"Z", "x":2, "y":2}, - {"label":"X", "x":3, "y":2}, - {"label":"C", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, - {"label":"B", "x":6, "y":2}, - {"label":"Space", "x":7, "y":2}, - {"label":"N", "x":8, "y":2}, - {"label":"M", "x":9, "y":2}, - {"label":",<", "x":10, "y":2}, - {"label":".>", "x":11, "y":2}, - {"label":"Backspace", "x":12, "y":2} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"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": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2} ] } } diff --git a/keyboards/takashicompany/compacx/compacx.c b/keyboards/takashicompany/compacx/compacx.c index cf23638920..5a63210c5b 100644 --- a/keyboards/takashicompany/compacx/compacx.c +++ b/keyboards/takashicompany/compacx/compacx.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "compacx.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/takashicompany/compacx/compacx.h b/keyboards/takashicompany/compacx/compacx.h deleted file mode 100644 index 61447abeb8..0000000000 --- a/keyboards/takashicompany/compacx/compacx.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l001, l002, l003, l004, l005, l006, l007, l008, r001, r002, r003, r004, r005, r006, r007, r008, \ - l201, l009, l010, l011, l012, l013, l901, r201, r009, r010, r011, r012, r013, r901, \ - l301, l014, l015, l016, l017, l018, r301, r014, r015, r016, r017, r018, \ - l401, l019, l020, l021, l022, l023, l024, r401, r019, r020, r021, r022, r023, r024, \ - l025, l101, l102, l026, l103, l104, l027, r025, r101, r102, r026, r103, r104, r027 \ -) { \ - { l001, l002, l003, l004, l005, l006, l007 }, \ - { l201, l009, l010, l011, l012, l013, l008 }, \ - { l301, l014, l015, l016, l017, l018, l901 }, \ - { l401, l019, l020, l021, l022, l023, l024 }, \ - { l025, l101, l102, l026, l103, l104, l027 }, \ - { r001, r002, r003, r004, r005, r006, r007 }, \ - { r201, r009, r010, r011, r012, r013, r008 }, \ - { r301, r014, r015, r016, r017, r018, r901 }, \ - { r401, r019, r020, r021, r022, r023, r024 }, \ - { r025, r101, r102, r026, r103, r104, r027 } \ -} diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index f67abdbd3f..edc71222a0 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -30,304 +30,85 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 4, - "y": 0 - }, - { - "x": 5, - "y": 0 - }, - { - "x": 6, - "y": 0 - }, - { - "x": 7, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 12, - "y": 0 - }, - { - "x": 13, - "y": 0 - }, - { - "x": 14, - "y": 0 - }, - { - "x": 15, - "y": 0 - }, - { - "x": 16, - "y": 0 - }, - { - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "x": 1.5, - "y": 1 - }, - { - "x": 2.5, - "y": 1 - }, - { - "x": 3.5, - "y": 1 - }, - { - "x": 4.5, - "y": 1 - }, - { - "x": 5.5, - "y": 1 - }, - { - "x": 6.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "x": 9, - "y": 1, - "w": 1.5 - }, - { - "x": 10.5, - "y": 1 - }, - { - "x": 11.5, - "y": 1 - }, - { - "x": 12.5, - "y": 1 - }, - { - "x": 13.5, - "y": 1 - }, - { - "x": 14.5, - "y": 1 - }, - { - "x": 15.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "x": 1.75, - "y": 2 - }, - { - "x": 2.75, - "y": 2 - }, - { - "x": 3.75, - "y": 2 - }, - { - "x": 4.75, - "y": 2 - }, - { - "x": 5.75, - "y": 2 - }, - { - "x": 9, - "y": 2, - "w": 1.75 - }, - { - "x": 10.75, - "y": 2 - }, - { - "x": 11.75, - "y": 2 - }, - { - "x": 12.75, - "y": 2 - }, - { - "x": 13.75, - "y": 2 - }, - { - "x": 14.75, - "y": 2 - }, - { - "x": 0, - "y": 3, - "w": 2 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "x": 4, - "y": 3 - }, - { - "x": 5, - "y": 3 - }, - { - "x": 6, - "y": 3 - }, - { - "x": 7, - "y": 3 - }, - { - "x": 9, - "y": 3, - "w": 2 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - }, - { - "x": 13, - "y": 3 - }, - { - "x": 14, - "y": 3 - }, - { - "x": 15, - "y": 3 - }, - { - "x": 16, - "y": 3 - }, - { - "x": 0, - "y": 4 - }, - { - "x": 1, - "y": 4, - "w": 1.25 - }, - { - "x": 2.25, - "y": 4, - "w": 1.25 - }, - { - "x": 3.5, - "y": 4 - }, - { - "x": 4.5, - "y": 4, - "w": 1.25 - }, - { - "x": 5.75, - "y": 4, - "w": 1.25 - }, - { - "x": 7, - "y": 4 - }, - { - "x": 9, - "y": 4 - }, - { - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "x": 12.5, - "y": 4 - }, - { - "x": 13.5, - "y": 4, - "w": 1.25 - }, - { - "x": 14.75, - "y": 4, - "w": 1.25 - }, - { - "x": 16, - "y": 4 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [1, 6], "x": 7, "y": 0}, + + {"matrix": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 6], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5}, + {"matrix": [6, 1], "x": 10.5, "y": 1}, + {"matrix": [6, 2], "x": 11.5, "y": 1}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 4], "x": 13.5, "y": 1}, + {"matrix": [6, 5], "x": 14.5, "y": 1}, + {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2, "w": 1.75}, + {"matrix": [7, 1], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 4], "x": 13.75, "y": 2}, + {"matrix": [7, 5], "x": 14.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3, "w": 2}, + {"matrix": [8, 1], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 4], "x": 14, "y": 3}, + {"matrix": [8, 5], "x": 15, "y": 3}, + {"matrix": [8, 6], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7, "y": 4}, + + {"matrix": [9, 0], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 12.5, "y": 4}, + {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 16, "y": 4} ] } } diff --git a/keyboards/takashicompany/dogtag/dogtag.c b/keyboards/takashicompany/dogtag/dogtag.c index e5d0779c08..0ca5f7c3e8 100644 --- a/keyboards/takashicompany/dogtag/dogtag.c +++ b/keyboards/takashicompany/dogtag/dogtag.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "dogtag.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { keypos_t key; diff --git a/keyboards/takashicompany/dogtag/dogtag.h b/keyboards/takashicompany/dogtag/dogtag.h deleted file mode 100644 index fb5ae151ea..0000000000 --- a/keyboards/takashicompany/dogtag/dogtag.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l01, l02, l03, l04, r01, r02, r03, r04, \ - l05, l06, l07, l08, l09, r05, r06, r07, r08, r09, \ - l10, l11, r10, r11 \ -) { \ - { l01, l02, l03, l04, KC_NO }, \ - { l05, l06, l07, l08, l09 }, \ - { l10, l11, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, r01, r02, r03, r04}, \ - { r05, r06, r07, r08, r09 }, \ - { r10, r11, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 2a91bd48f0..8c572ad32f 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -35,94 +35,33 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 8, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "x": 4, - "y": 2 - }, - { - "x": 7, - "y": 2 - }, - { - "x": 8, - "y": 1 - }, - { - "x": 9, - "y": 1 - }, - { - "x": 10, - "y": 1 - }, - { - "x": 11, - "y": 1 - }, - { - "x": 3.5, - "y": 3.25 - }, - { - "x": 4.5, - "y": 3.25 - }, - { - "x": 6.5, - "y": 3.25 - }, - { - "x": 7.5, - "y": 3.25 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [3, 1], "x": 8, "y": 0}, + {"matrix": [3, 2], "x": 9, "y": 0}, + {"matrix": [3, 3], "x": 10, "y": 0}, + {"matrix": [3, 4], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 2}, + + {"matrix": [4, 0], "x": 7, "y": 2}, + {"matrix": [4, 1], "x": 8, "y": 1}, + {"matrix": [4, 2], "x": 9, "y": 1}, + {"matrix": [4, 3], "x": 10, "y": 1}, + {"matrix": [4, 4], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 3.5, "y": 3.25}, + {"matrix": [2, 1], "x": 4.5, "y": 3.25}, + + {"matrix": [5, 0], "x": 6.5, "y": 3.25}, + {"matrix": [5, 1], "x": 7.5, "y": 3.25} ] } } diff --git a/keyboards/takashicompany/endzone34/endzone34.c b/keyboards/takashicompany/endzone34/endzone34.c index f96c6b3f35..403c4b7bb9 100644 --- a/keyboards/takashicompany/endzone34/endzone34.c +++ b/keyboards/takashicompany/endzone34/endzone34.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "endzone34.h" +#include "quantum.h" oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_270; diff --git a/keyboards/takashicompany/endzone34/endzone34.h b/keyboards/takashicompany/endzone34/endzone34.h deleted file mode 100644 index f3e5c88b63..0000000000 --- a/keyboards/takashicompany/endzone34/endzone34.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \ - k31, k32, k33, k34 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k20 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \ - { KC_NO, KC_NO, KC_NO, k31, k32, k33, k34, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index e9c9437902..8eb5b4dd57 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -18,46 +18,49 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":0.5}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Y", "x":7, "y":0}, - {"label":"U", "x":8, "y":0}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0}, - {"label":"P", "x":11, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, - {"label":"A", "x":0, "y":1.5}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"H", "x":7, "y":1}, - {"label":"J", "x":8, "y":1}, - {"label":"K", "x":9, "y":1}, - {"label":"L", "x":10, "y":1}, - {"label":"Enter", "x":11, "y":1.5}, + {"matrix": [0, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.5}, - {"label":"Z", "x":0, "y":2.5}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"N", "x":7, "y":2}, - {"label":"M", "x":8, "y":2}, - {"label":", ", "x":9, "y":2}, - {"label":".", "x":10, "y":2}, - {"label":"Back Space", "x":11, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, - {"label":"⇓", "x":4, "y":3}, - {"label":"Tab", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"⇑", "x":7, "y":3} + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [2, 5], "x": 7, "y": 2}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.5}, + + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3} ] } } diff --git a/keyboards/takashicompany/heavy_left/heavy_left.h b/keyboards/takashicompany/heavy_left/heavy_left.h deleted file mode 100644 index a54f88b303..0000000000 --- a/keyboards/takashicompany/heavy_left/heavy_left.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l06, l07, l08, l09, l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \ - l16, l17, l18, l19, l10, l11, l12, l13, l14, l15, r10, r11, r12, r13, r14, r15, r16, r17, r18, \ - l26, l27, l28, l29, l20, l21, l22, l23, l24, l25, r20, r21, r22, r23, r24, r25, r26, r27, \ - l36, l37, l38, l39, l30, l31, l32, l33, l34, l35, r30, r31, r32, r33, r34, r35, r36, r37, r38, \ - l46, l47, l48, l49, l40, l41, l42, l43, l44, l45, r40, r41, r42, r43, r44, r45, r46, r47, r48 \ -) { \ - { l00, l01, l02, l03, l04, l05, l06, l07, l08, l09 }, \ - { l10, l11, l12, l13, l14, l15, l16, l17, l18, l19 }, \ - { l20, l21, l22, l23, l24, l25, l26, l27, l28, l29 }, \ - { l30, l31, l32, l33, l34, l35, l36, l37, l38, l39 }, \ - { l40, l41, l42, l43, l44, l45, l46, l47, l48, l49 }, \ - { r00, r01, r02, r03, r04, r05, r06, r07, r09, KC_NO }, \ - { r10, r11, r12, r13, r14, r15, r16, r08, r18, KC_NO }, \ - { r20, r21, r22, r23, r24, r25, r26, r17, r27, KC_NO }, \ - { r30, r31, r32, r33, r34, r35, r36, r37, r38, KC_NO }, \ - { r40, r41, r42, r43, r44, r45, r46, r47, r48, KC_NO } \ -} diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 95ecb65e1b..a48fceb8d1 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -24,491 +24,120 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "24", - "x": 0, - "y": 0 - }, - { - "label": "25", - "x": 1, - "y": 0 - }, - { - "label": "26", - "x": 2, - "y": 0 - }, - { - "label": "27", - "x": 3, - "y": 0 - }, - { - "label": "1", - "x": 4.25, - "y": 0 - }, - { - "label": "2", - "x": 5.25, - "y": 0 - }, - { - "label": "3", - "x": 6.25, - "y": 0 - }, - { - "label": "4", - "x": 7.25, - "y": 0 - }, - { - "label": "5", - "x": 8.25, - "y": 0 - }, - { - "label": "6", - "x": 9.25, - "y": 0 - }, - { - "label": "44", - "x": 10.75, - "y": 0 - }, - { - "label": "45", - "x": 11.75, - "y": 0 - }, - { - "label": "46", - "x": 12.75, - "y": 0 - }, - { - "label": "47", - "x": 13.75, - "y": 0 - }, - { - "label": "48", - "x": 14.75, - "y": 0 - }, - { - "label": "49", - "x": 15.75, - "y": 0 - }, - { - "label": "50", - "x": 16.75, - "y": 0 - }, - { - "label": "51", - "x": 17.75, - "y": 0 - }, - { - "label": "52", - "x": 18.75, - "y": 0 - }, - { - "label": "82", - "x": 20, - "y": 0 - }, - { - "label": "28", - "x": 0, - "y": 1 - }, - { - "label": "29", - "x": 1, - "y": 1 - }, - { - "label": "30", - "x": 2, - "y": 1 - }, - { - "label": "31", - "x": 3, - "y": 1 - }, - { - "label": "201", - "x": 4.25, - "y": 1, - "w": 1.5 - }, - { - "label": "7", - "x": 5.75, - "y": 1 - }, - { - "label": "8", - "x": 6.75, - "y": 1 - }, - { - "label": "9", - "x": 7.75, - "y": 1 - }, - { - "label": "10", - "x": 8.75, - "y": 1 - }, - { - "label": "11", - "x": 9.75, - "y": 1 - }, - { - "label": "53", - "x": 11.25, - "y": 1 - }, - { - "label": "54", - "x": 12.25, - "y": 1 - }, - { - "label": "55", - "x": 13.25, - "y": 1 - }, - { - "label": "56", - "x": 14.25, - "y": 1 - }, - { - "label": "57", - "x": 15.25, - "y": 1 - }, - { - "label": "58", - "x": 16.25, - "y": 1 - }, - { - "label": "59", - "x": 17.25, - "y": 1 - }, - { - "label": "901", - "x": 18.5, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "label": "83", - "x": 20, - "y": 1 - }, - { - "label": "32", - "x": 0, - "y": 2 - }, - { - "label": "33", - "x": 1, - "y": 2 - }, - { - "label": "34", - "x": 2, - "y": 2 - }, - { - "label": "35", - "x": 3, - "y": 2 - }, - { - "label": "301", - "x": 4.25, - "y": 2, - "w": 1.75 - }, - { - "label": "12", - "x": 6, - "y": 2 - }, - { - "label": "13", - "x": 7, - "y": 2 - }, - { - "label": "14", - "x": 8, - "y": 2 - }, - { - "label": "15", - "x": 9, - "y": 2 - }, - { - "label": "16", - "x": 10, - "y": 2 - }, - { - "label": "60", - "x": 11.5, - "y": 2 - }, - { - "label": "61", - "x": 12.5, - "y": 2 - }, - { - "label": "62", - "x": 13.5, - "y": 2 - }, - { - "label": "63", - "x": 14.5, - "y": 2 - }, - { - "label": "64", - "x": 15.5, - "y": 2 - }, - { - "label": "65", - "x": 16.5, - "y": 2 - }, - { - "label": "66", - "x": 17.5, - "y": 2 - }, - { - "label": "84", - "x": 20, - "y": 2 - }, - { - "label": "36", - "x": 0, - "y": 3 - }, - { - "label": "37", - "x": 1, - "y": 3 - }, - { - "label": "38", - "x": 2, - "y": 3 - }, - { - "label": "39", - "x": 3, - "y": 3 - }, - { - "label": "601", - "x": 4.25, - "y": 3, - "w": 2.25 - }, - { - "label": "17", - "x": 6.5, - "y": 3 - }, - { - "label": "18", - "x": 7.5, - "y": 3 - }, - { - "label": "19", - "x": 8.5, - "y": 3 - }, - { - "label": "20", - "x": 9.5, - "y": 3 - }, - { - "label": "21", - "x": 10.5, - "y": 3 - }, - { - "label": "67", - "x": 11.75, - "y": 3 - }, - { - "label": "68", - "x": 12.75, - "y": 3 - }, - { - "label": "69", - "x": 13.75, - "y": 3 - }, - { - "label": "70", - "x": 14.75, - "y": 3 - }, - { - "label": "71", - "x": 15.75, - "y": 3 - }, - { - "label": "72", - "x": 16.75, - "y": 3 - }, - { - "label": "73", - "x": 17.75, - "y": 3 - }, - { - "label": "74", - "x": 18.75, - "y": 3 - }, - { - "label": "85", - "x": 20, - "y": 3 - }, - { - "label": "40", - "x": 0, - "y": 4 - }, - { - "label": "41", - "x": 1, - "y": 4 - }, - { - "label": "42", - "x": 2, - "y": 4 - }, - { - "label": "43", - "x": 3, - "y": 4 - }, - { - "label": "101", - "x": 4.25, - "y": 4, - "w": 1.25 - }, - { - "label": "22", - "x": 5.5, - "y": 4 - }, - { - "label": "102", - "x": 6.5, - "y": 4, - "w": 1.25 - }, - { - "label": "23", - "x": 7.75, - "y": 4 - }, - { - "label": "103", - "x": 8.75, - "y": 4, - "w": 1.25 - }, - { - "label": "104", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "75", - "x": 11.5, - "y": 4 - }, - { - "label": "105", - "x": 12.5, - "y": 4, - "w": 1.25 - }, - { - "label": "76", - "x": 13.75, - "y": 4 - }, - { - "label": "77", - "x": 14.75, - "y": 4 - }, - { - "label": "78", - "x": 15.75, - "y": 4 - }, - { - "label": "79", - "x": 16.75, - "y": 4 - }, - { - "label": "80", - "x": 17.75, - "y": 4 - }, - { - "label": "81", - "x": 18.75, - "y": 4 - }, - { - "label": "86", - "x": 20, - "y": 4 - } + {"matrix": [0, 6], "x": 0, "y": 0}, + {"matrix": [0, 7], "x": 1, "y": 0}, + {"matrix": [0, 8], "x": 2, "y": 0}, + {"matrix": [0, 9], "x": 3, "y": 0}, + + {"matrix": [0, 0], "x": 4.25, "y": 0}, + {"matrix": [0, 1], "x": 5.25, "y": 0}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [0, 5], "x": 9.25, "y": 0}, + + {"matrix": [5, 0], "x": 10.75, "y": 0}, + {"matrix": [5, 1], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 3], "x": 13.75, "y": 0}, + {"matrix": [5, 4], "x": 14.75, "y": 0}, + {"matrix": [5, 5], "x": 15.75, "y": 0}, + {"matrix": [5, 6], "x": 16.75, "y": 0}, + {"matrix": [5, 7], "x": 17.75, "y": 0}, + {"matrix": [6, 7], "x": 18.75, "y": 0}, + + {"matrix": [5, 8], "x": 20, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 7], "x": 1, "y": 1}, + {"matrix": [1, 8], "x": 2, "y": 1}, + {"matrix": [1, 9], "x": 3, "y": 1}, + + {"matrix": [1, 0], "x": 4.25, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 5.75, "y": 1}, + {"matrix": [1, 2], "x": 6.75, "y": 1}, + {"matrix": [1, 3], "x": 7.75, "y": 1}, + {"matrix": [1, 4], "x": 8.75, "y": 1}, + {"matrix": [1, 5], "x": 9.75, "y": 1}, + + {"matrix": [6, 0], "x": 11.25, "y": 1}, + {"matrix": [6, 1], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 4], "x": 15.25, "y": 1}, + {"matrix": [6, 5], "x": 16.25, "y": 1}, + {"matrix": [6, 6], "x": 17.25, "y": 1}, + {"matrix": [7, 7], "x": 18.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [6, 8], "x": 20, "y": 1}, + + {"matrix": [2, 6], "x": 0, "y": 2}, + {"matrix": [2, 7], "x": 1, "y": 2}, + {"matrix": [2, 8], "x": 2, "y": 2}, + {"matrix": [2, 9], "x": 3, "y": 2}, + + {"matrix": [2, 0], "x": 4.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 6, "y": 2}, + {"matrix": [2, 2], "x": 7, "y": 2}, + {"matrix": [2, 3], "x": 8, "y": 2}, + {"matrix": [2, 4], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + + {"matrix": [7, 0], "x": 11.5, "y": 2}, + {"matrix": [7, 1], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 4], "x": 15.5, "y": 2}, + {"matrix": [7, 5], "x": 16.5, "y": 2}, + {"matrix": [7, 6], "x": 17.5, "y": 2}, + + {"matrix": [7, 8], "x": 20, "y": 2}, + + {"matrix": [3, 6], "x": 0, "y": 3}, + {"matrix": [3, 7], "x": 1, "y": 3}, + {"matrix": [3, 8], "x": 2, "y": 3}, + {"matrix": [3, 9], "x": 3, "y": 3}, + + {"matrix": [3, 0], "x": 4.25, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 6.5, "y": 3}, + {"matrix": [3, 2], "x": 7.5, "y": 3}, + {"matrix": [3, 3], "x": 8.5, "y": 3}, + {"matrix": [3, 4], "x": 9.5, "y": 3}, + {"matrix": [3, 5], "x": 10.5, "y": 3}, + + {"matrix": [8, 0], "x": 11.75, "y": 3}, + {"matrix": [8, 1], "x": 12.75, "y": 3}, + {"matrix": [8, 2], "x": 13.75, "y": 3}, + {"matrix": [8, 3], "x": 14.75, "y": 3}, + {"matrix": [8, 4], "x": 15.75, "y": 3}, + {"matrix": [8, 5], "x": 16.75, "y": 3}, + {"matrix": [8, 6], "x": 17.75, "y": 3}, + {"matrix": [8, 7], "x": 18.75, "y": 3}, + + {"matrix": [8, 8], "x": 20, "y": 3}, + + {"matrix": [4, 6], "x": 0, "y": 4}, + {"matrix": [4, 7], "x": 1, "y": 4}, + {"matrix": [4, 8], "x": 2, "y": 4}, + {"matrix": [4, 9], "x": 3, "y": 4}, + + {"matrix": [4, 0], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 5.5, "y": 4}, + {"matrix": [4, 2], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 7.75, "y": 4}, + {"matrix": [4, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 11.5, "y": 4}, + {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13.75, "y": 4}, + {"matrix": [9, 3], "x": 14.75, "y": 4}, + {"matrix": [9, 4], "x": 15.75, "y": 4}, + {"matrix": [9, 5], "x": 16.75, "y": 4}, + {"matrix": [9, 6], "x": 17.75, "y": 4}, + {"matrix": [9, 7], "x": 18.75, "y": 4}, + + {"matrix": [9, 8], "x": 20, "y": 4} ] } } diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index c591487e7b..806a255bcb 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -21,47 +21,51 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 0, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 0, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84 }, + {"matrix": [0, 0], "x": 0, "y": 0.42, "w": 0.84, "h": 0.84}, + {"matrix": [0, 1], "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [0, 2], "x": 1.68, "y": 0, "w": 0.84, "h": 0.84}, + {"matrix": [0, 3], "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [0, 4], "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84}, - { "x": 0, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84 }, + {"matrix": [0, 5], "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84}, + {"matrix": [0, 6], "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [1, 0], "x": 7.56, "y": 0, "w": 0.84, "h": 0.84}, + {"matrix": [1, 1], "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [1, 2], "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84}, - { "x": 0, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84 }, + {"matrix": [1, 3], "x": 0, "y": 1.26, "w": 0.84, "h": 0.84}, + {"matrix": [1, 4], "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [1, 5], "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84}, + {"matrix": [1, 6], "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 0], "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84}, - { "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84 } + {"matrix": [2, 1], "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84}, + {"matrix": [2, 2], "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 3], "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84}, + {"matrix": [2, 4], "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 5], "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84}, + + {"matrix": [2, 6], "x": 0, "y": 2.1, "w": 0.84, "h": 0.84}, + {"matrix": [3, 0], "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 1], "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84}, + {"matrix": [3, 2], "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 3], "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84}, + + {"matrix": [3, 4], "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84}, + {"matrix": [3, 5], "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 6], "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84}, + {"matrix": [4, 0], "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [4, 1], "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84}, + + {"matrix": [4, 2], "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84}, + {"matrix": [4, 3], "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84}, + {"matrix": [4, 4], "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [4, 5], "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84}, + + {"matrix": [4, 6], "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [5, 0], "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [5, 1], "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84}, + {"matrix": [5, 2], "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84} ] } } diff --git a/keyboards/takashicompany/minizone/minizone.c b/keyboards/takashicompany/minizone/minizone.c index 5231c8c497..1574b0aef7 100644 --- a/keyboards/takashicompany/minizone/minizone.c +++ b/keyboards/takashicompany/minizone/minizone.c @@ -1,7 +1,7 @@ // Copyright 2022 takashicompany (@takashicompany) // SPDX-License-Identifier: GPL-2.0-or-later -#include "minizone.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/takashicompany/minizone/minizone.h b/keyboards/takashicompany/minizone/minizone.h deleted file mode 100644 index 0e8d62c30d..0000000000 --- a/keyboards/takashicompany/minizone/minizone.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k10, k11, k12, \ - k13, k14, k15, k16, k20, k21, k22, k23, k24, k25, \ - k26, k30, k31, k32, k33, k34, k35, k36, k40, k41, \ - k42, k43, k44, k45, k46, k50, k51, k52 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, k36 }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { k50, k51, k52, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index d7e9e2271e..c9aacaabc2 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -23,46 +23,46 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "w":1.5}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, - {"x":0, "y":1, "w":1.75}, - {"x":1.75, "y":1}, - {"x":2.75, "y":1}, - {"x":3.75, "y":1}, - {"x":4.75, "y":1}, - {"x":5.75, "y":1}, - {"x":6.75, "y":1}, - {"x":7.75, "y":1}, - {"x":8.75, "y":1}, - {"x":9.75, "y":1}, - {"x":10.75, "y":1}, - {"x":11.75, "y":0, "w":1.25, "h":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 0, "w": 1.25, "h": 2}, - {"x":0, "y":2, "w":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"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": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2} ] } } diff --git a/keyboards/takashicompany/qoolee/qoolee.h b/keyboards/takashicompany/qoolee/qoolee.h deleted file mode 100644 index 986e7e3ec3..0000000000 --- a/keyboards/takashicompany/qoolee/qoolee.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b \ -) { \ - { k00, k01, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b } \ -} diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index d9b0e1aaa0..e3af5b8371 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -21,186 +21,59 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 4, - "y": 0 - }, - { - "x": 5, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 12, - "y": 0 - }, - { - "x": 13, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "x": 4, - "y": 1 - }, - { - "x": 5, - "y": 1 - }, - { - "x": 7, - "y": 1 - }, - { - "x": 9, - "y": 1 - }, - { - "x": 10, - "y": 1 - }, - { - "x": 11, - "y": 1 - }, - { - "x": 12, - "y": 1 - }, - { - "x": 13, - "y": 1 - }, - { - "x": 14, - "y": 1 - }, - { - "x": 0, - "y": 2 - }, - { - "x": 1, - "y": 2 - }, - { - "x": 2, - "y": 2 - }, - { - "x": 3, - "y": 2 - }, - { - "x": 4, - "y": 2 - }, - { - "x": 5, - "y": 2 - }, - { - "x": 9, - "y": 2 - }, - { - "x": 10, - "y": 2 - }, - { - "x": 11, - "y": 2 - }, - { - "x": 12, - "y": 2 - }, - { - "x": 13, - "y": 2 - }, - { - "x": 14, - "y": 2 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "x": 4, - "y": 3 - }, - { - "x": 5, - "y": 3 - }, - { - "x": 6, - "y": 3 - }, - { - "x": 8, - "y": 3 - }, - { - "x": 9, - "y": 3 - }, - { - "x": 10, - "y": 3 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - } + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [1, 1], "x": 12, "y": 0}, + {"matrix": [1, 2], "x": 13, "y": 0}, + + {"matrix": [5, 5], "x": 0, "y": 1}, + {"matrix": [1, 3], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 5], "x": 3, "y": 1}, + {"matrix": [1, 6], "x": 4, "y": 1}, + {"matrix": [2, 0], "x": 5, "y": 1}, + + {"matrix": [6, 2], "x": 7, "y": 1}, + + {"matrix": [2, 1], "x": 9, "y": 1}, + {"matrix": [2, 2], "x": 10, "y": 1}, + {"matrix": [2, 3], "x": 11, "y": 1}, + {"matrix": [2, 4], "x": 12, "y": 1}, + {"matrix": [2, 5], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, + + {"matrix": [5, 6], "x": 0, "y": 2}, + {"matrix": [2, 6], "x": 1, "y": 2}, + {"matrix": [3, 0], "x": 2, "y": 2}, + {"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": 9, "y": 2}, + {"matrix": [3, 5], "x": 10, "y": 2}, + {"matrix": [3, 6], "x": 11, "y": 2}, + {"matrix": [4, 0], "x": 12, "y": 2}, + {"matrix": [4, 1], "x": 13, "y": 2}, + {"matrix": [6, 1], "x": 14, "y": 2}, + + {"matrix": [4, 2], "x": 2, "y": 3}, + {"matrix": [4, 3], "x": 3, "y": 3}, + {"matrix": [4, 4], "x": 4, "y": 3}, + {"matrix": [4, 5], "x": 5, "y": 3}, + {"matrix": [4, 6], "x": 6, "y": 3}, + + {"matrix": [5, 0], "x": 8, "y": 3}, + {"matrix": [5, 1], "x": 9, "y": 3}, + {"matrix": [5, 2], "x": 10, "y": 3}, + {"matrix": [5, 3], "x": 11, "y": 3}, + {"matrix": [5, 4], "x": 12, "y": 3} ] } } diff --git a/keyboards/takashicompany/radialex/radialex.h b/keyboards/takashicompany/radialex/radialex.h deleted file mode 100644 index 8ad5712201..0000000000 --- a/keyboards/takashicompany/radialex/radialex.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \ - k41, k11, k12, k13, k14, k15, k45, k16, k17, k18, k19, k20, k43, \ - k42, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k44, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07 }, \ - { k08, k09, k10, k11, k12, k13, k14 }, \ - { k15, k16, k17, k18, k19, k20, k21 }, \ - { k22, k23, k24, k25, k26, k27, k28 }, \ - { k29, k30, k31, k32, k33, k34, k35 }, \ - { k36, k37, k38, k39, k40, k41, k42 }, \ - { k43, k44, k45, KC_NO, KC_NO, KC_NO, KC_NO } \ -} |