diff options
Diffstat (limited to 'keyboards')
231 files changed, 965 insertions, 3523 deletions
diff --git a/keyboards/0xcb/1337/1337.c b/keyboards/0xcb/1337/1337.c index 85781209b3..d5937540b2 100644 --- a/keyboards/0xcb/1337/1337.c +++ b/keyboards/0xcb/1337/1337.c @@ -14,7 +14,7 @@ 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/>. */ -#include "1337.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/0xcb/1337/1337.h b/keyboards/0xcb/1337/1337.h deleted file mode 100644 index e1f238c126..0000000000 --- a/keyboards/0xcb/1337/1337.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 0xCB - Conor Burns - -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 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. - */ -// clang-format off - #define LAYOUT( \ - KA1, KA2, KA3, \ - KB1, KB2, KB3, \ - KC1, KC2, KC3 \ - ) \ - { \ - { KA1, KA2, KA3 }, \ - { KB1, KB2, KB3 }, \ - { KC1, KC2, KC3 } \ - } -// clang-format on diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index ca04777536..fb4480e1b0 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json index 0d9585dbb5..646b4dc882 100644 --- a/keyboards/0xcb/tutelpad/info.json +++ b/keyboards/0xcb/tutelpad/info.json @@ -22,15 +22,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k03", "x": 0, "y": 0}, - {"label": "k02", "x": 1, "y": 0}, - {"label": "k01", "x": 2, "y": 0}, - {"label": "k00", "x": 3, "y": 0}, + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, - {"label": "k13", "x": 0, "y": 1}, - {"label": "k12", "x": 1, "y": 1}, - {"label": "k11", "x": 2, "y": 1}, - {"label": "k10", "x": 3, "y": 1} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]} ] } } diff --git a/keyboards/0xcb/tutelpad/tutelpad.c b/keyboards/0xcb/tutelpad/tutelpad.c index 25c2d22219..36671d5bd1 100644 --- a/keyboards/0xcb/tutelpad/tutelpad.c +++ b/keyboards/0xcb/tutelpad/tutelpad.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "tutelpad.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/0xcb/tutelpad/tutelpad.h b/keyboards/0xcb/tutelpad/tutelpad.h deleted file mode 100644 index 0115c50fa4..0000000000 --- a/keyboards/0xcb/tutelpad/tutelpad.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 ItsFiremanSam - * - * 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, \ - k10, k11, k12, k13 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 } \ -} diff --git a/keyboards/1k/1k.c b/keyboards/1k/1k.c deleted file mode 100644 index 0e8f44b44d..0000000000 --- a/keyboards/1k/1k.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 zvecr<git@zvecr.com> - * - * 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/>. - */ -#include "1k.h" diff --git a/keyboards/1k/1k.h b/keyboards/1k/1k.h deleted file mode 100644 index a6142bc5c5..0000000000 --- a/keyboards/1k/1k.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 zvecr<git@zvecr.com> - * - * 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 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_ortho_1x1( \ - K01 \ -) \ -{ \ - { K01 }, \ -} diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json index 8a27d94862..5168b69081 100644 --- a/keyboards/1k/info.json +++ b/keyboards/1k/info.json @@ -16,7 +16,7 @@ "layouts": { "LAYOUT_ortho_1x1": { "layout": [ - {"x":0, "y":0} + {"x":0, "y":0, "matrix": [0, 0]} ] } } diff --git a/keyboards/25keys/cassette42/cassette42.c b/keyboards/25keys/cassette42/cassette42.c deleted file mode 100644 index f5ca2b8a98..0000000000 --- a/keyboards/25keys/cassette42/cassette42.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 monksoffunk - * - * 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/>. - */ -#include "cassette42.h" diff --git a/keyboards/25keys/cassette42/cassette42.h b/keyboards/25keys/cassette42/cassette42.h deleted file mode 100644 index 32a686f3de..0000000000 --- a/keyboards/25keys/cassette42/cassette42.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 monksoffunk - * - * 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 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( \ - k10, k11, \ - k00, k01, k02, k03\ -) \ -{ \ - { k00, k01, k02, k03, k10, k11 }, \ -} diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json index 546e02ab63..280733feb9 100644 --- a/keyboards/25keys/cassette42/info.json +++ b/keyboards/25keys/cassette42/info.json @@ -17,7 +17,14 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}] + "layout": [ + {"x":0.5, "y":0.75, "matrix": [0, 4]}, + {"x":2.5, "y":0.75, "matrix": [0, 5]}, + {"x":0, "y":1.75, "matrix": [0, 0]}, + {"x":1, "y":1.75, "matrix": [0, 1]}, + {"x":2, "y":1.75, "matrix": [0, 2]}, + {"x":3, "y":1.75, "matrix": [0, 3]} + ] } } } diff --git a/keyboards/40percentclub/4pack/4pack.c b/keyboards/40percentclub/4pack/4pack.c index 4ab3575ca4..bd2efa5620 100644 --- a/keyboards/40percentclub/4pack/4pack.c +++ b/keyboards/40percentclub/4pack/4pack.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "4pack.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/40percentclub/4pack/4pack.h b/keyboards/40percentclub/4pack/4pack.h deleted file mode 100644 index 1340300ace..0000000000 --- a/keyboards/40percentclub/4pack/4pack.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2019 Arda Kilicdagi - * - * 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 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 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ -} diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json index 1665c7b35b..9cdb584b0c 100644 --- a/keyboards/40percentclub/4pack/info.json +++ b/keyboards/40percentclub/4pack/info.json @@ -17,7 +17,12 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]} + ] } } } diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json index 430129a6a1..86c73f1943 100644 --- a/keyboards/40percentclub/nano/info.json +++ b/keyboards/40percentclub/nano/info.json @@ -16,9 +16,21 @@ ["D1", "D0", "D4", "C6"] ] }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_2x4" + }, "layouts": { "LAYOUT_ortho_2x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + "layout": [ + {"x":0, "y":0, "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":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]} + ] } } } diff --git a/keyboards/40percentclub/nano/nano.c b/keyboards/40percentclub/nano/nano.c deleted file mode 100644 index 8761e8add4..0000000000 --- a/keyboards/40percentclub/nano/nano.c +++ /dev/null @@ -1 +0,0 @@ -#include "nano.h" diff --git a/keyboards/40percentclub/nano/nano.h b/keyboards/40percentclub/nano/nano.h deleted file mode 100644 index 881309738b..0000000000 --- a/keyboards/40percentclub/nano/nano.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_2x4( \ - k01, k02, k03, k04, \ - k05, k06, k07, k08 \ - ) { \ - { k01, k02, k03, k04 }, \ - { k05, k06, k07, k08 } \ -} - -#define LAYOUT LAYOUT_ortho_2x4 diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json index ba39cb834d..9a335dad43 100644 --- a/keyboards/40percentclub/nein/info.json +++ b/keyboards/40percentclub/nein/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT_ortho_3x3": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/40percentclub/nein/nein.c b/keyboards/40percentclub/nein/nein.c deleted file mode 100644 index 0b4d05d941..0000000000 --- a/keyboards/40percentclub/nein/nein.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 - * - * 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/>. - */ -#include "nein.h" diff --git a/keyboards/40percentclub/nein/nein.h b/keyboards/40percentclub/nein/nein.h deleted file mode 100644 index fd0118f75b..0000000000 --- a/keyboards/40percentclub/nein/nein.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 - * - * 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 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_ortho_3x3( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json index 9c3015b5dd..4e7f39c9c6 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/info.json @@ -25,8 +25,12 @@ "layouts": { "LAYOUT_ortho_2x3": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]} ] } } diff --git a/keyboards/40percentclub/sixpack/sixpack.c b/keyboards/40percentclub/sixpack/sixpack.c index cc0e9e3add..c8c7bad444 100644 --- a/keyboards/40percentclub/sixpack/sixpack.c +++ b/keyboards/40percentclub/sixpack/sixpack.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "sixpack.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(B6); // Backlight cathodes Col.3 diff --git a/keyboards/40percentclub/sixpack/sixpack.h b/keyboards/40percentclub/sixpack/sixpack.h deleted file mode 100644 index 94db5ee9e8..0000000000 --- a/keyboards/40percentclub/sixpack/sixpack.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 - * - * 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 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_ortho_2x3( \ - k00, k01, k02, \ - k10, k11, k12 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 } \ -} diff --git a/keyboards/8pack/8pack.c b/keyboards/8pack/8pack.c deleted file mode 100644 index e89d7281de..0000000000 --- a/keyboards/8pack/8pack.c +++ /dev/null @@ -1 +0,0 @@ -#include "8pack.h" diff --git a/keyboards/8pack/8pack.h b/keyboards/8pack/8pack.h deleted file mode 100644 index 1c4ffb55b8..0000000000 --- a/keyboards/8pack/8pack.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_8pack_rev11 - #include "rev11.h" -#endif - -#ifdef KEYBOARD_8pack_rev12 - #include "rev12.h" -#endif
\ No newline at end of file diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index fa33b2644f..63cc0e23de 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -14,19 +14,5 @@ ["F4", "F5", "F6", "F7"], ["B1", "B3", "B2", "B6"] ] - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1} - ] - } } } diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/info.json index 90ac25f360..6d4d61fe13 100644 --- a/keyboards/8pack/rev11/info.json +++ b/keyboards/8pack/rev11/info.json @@ -1,5 +1,19 @@ { "usb": { "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0, "matrix": [1, 3]}, + {"x":1, "y":0, "matrix": [1, 2]}, + {"x":2, "y":0, "matrix": [1, 1]}, + {"x":3, "y":0, "matrix": [1, 0]}, + {"x":0, "y":1, "matrix": [0, 3]}, + {"x":1, "y":1, "matrix": [0, 2]}, + {"x":2, "y":1, "matrix": [0, 1]}, + {"x":3, "y":1, "matrix": [0, 0]} + ] + } } } diff --git a/keyboards/8pack/rev11/rev11.c b/keyboards/8pack/rev11/rev11.c deleted file mode 100644 index c54ecbe87e..0000000000 --- a/keyboards/8pack/rev11/rev11.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev11.h" diff --git a/keyboards/8pack/rev11/rev11.h b/keyboards/8pack/rev11/rev11.h deleted file mode 100644 index ebf8529ad0..0000000000 --- a/keyboards/8pack/rev11/rev11.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "8pack.h" - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K13, K12, K11, K10 }, \ - { K03, K02, K01, K00 } \ -} diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/info.json index e557e4d307..05b1a290ae 100644 --- a/keyboards/8pack/rev12/info.json +++ b/keyboards/8pack/rev12/info.json @@ -1,5 +1,19 @@ { "usb": { "device_version": "0.0.2" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0, "matrix": [0, 3]}, + {"x":1, "y":0, "matrix": [0, 2]}, + {"x":2, "y":0, "matrix": [0, 1]}, + {"x":3, "y":0, "matrix": [0, 0]}, + {"x":0, "y":1, "matrix": [1, 3]}, + {"x":1, "y":1, "matrix": [1, 2]}, + {"x":2, "y":1, "matrix": [1, 1]}, + {"x":3, "y":1, "matrix": [1, 0]} + ] + } } } diff --git a/keyboards/8pack/rev12/rev12.c b/keyboards/8pack/rev12/rev12.c deleted file mode 100644 index b2d091af49..0000000000 --- a/keyboards/8pack/rev12/rev12.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev12.h" diff --git a/keyboards/8pack/rev12/rev12.h b/keyboards/8pack/rev12/rev12.h deleted file mode 100644 index 3efeb06de5..0000000000 --- a/keyboards/8pack/rev12/rev12.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "8pack.h" - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K03, K02, K01, K00 }, \ - { K13, K12, K11, K10 } \ -} diff --git a/keyboards/a_dux/a_dux.c b/keyboards/a_dux/a_dux.c index 16bac16fa9..16c3406f48 100644 --- a/keyboards/a_dux/a_dux.c +++ b/keyboards/a_dux/a_dux.c @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "a_dux.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/a_dux/a_dux.h b/keyboards/a_dux/a_dux.h deleted file mode 100644 index 83c0a3692b..0000000000 --- a/keyboards/a_dux/a_dux.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.com> - * - * 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/>. - */ - -#include "quantum.h" - -/* This 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. - */ - -// readability -#define ___ KC_NO - -#define LAYOUT_split_3x5_2( \ - L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ - L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ - L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ - L16, L17, R16, R17 \ - ) \ - { \ - { L01, L02, L03, L04, L05 }, \ - { L06, L07, L08, L09, L10 }, \ - { L11, L12, L13, L14, L15 }, \ - { L16, L17, ___, ___, ___ }, \ - { R01, R02, R03, R04, R05 }, \ - { R06, R07, R08, R09, R10 }, \ - { R11, R12, R13, R14, R15 }, \ - { R16, R17, ___, ___, ___ } \ - } - -#define LAYOUT LAYOUT_split_3x5_2 - diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json index c0aef4bebf..29259a180c 100644 --- a/keyboards/a_dux/info.json +++ b/keyboards/a_dux/info.json @@ -35,50 +35,53 @@ } }, "community_layouts": ["split_3x5_2"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_2" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"x": 0, "y": 1.33}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"x": 0, "y": 1.33, "matrix": [0, 0]}, + {"x": 1, "y": 0.31, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0.28, "matrix": [0, 3]}, + {"x": 4, "y": 0.42, "matrix": [0, 4]}, - {"x": 8, "y": 0.42}, - {"x": 9, "y": 0.28}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0.31}, - {"x": 12, "y": 1.33}, + {"x": 8, "y": 0.42, "matrix": [4, 0]}, + {"x": 9, "y": 0.28, "matrix": [4, 1]}, + {"x": 10, "y": 0, "matrix": [4, 2]}, + {"x": 11, "y": 0.31, "matrix": [4, 3]}, + {"x": 12, "y": 1.33, "matrix": [4, 4]}, - {"x": 0, "y": 2.33}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"x": 0, "y": 2.33, "matrix": [1, 0]}, + {"x": 1, "y": 1.31, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1.28, "matrix": [1, 3]}, + {"x": 4, "y": 1.42, "matrix": [1, 4]}, - {"x": 8, "y": 1.42}, - {"x": 9, "y": 1.28}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1.31}, - {"x": 12, "y": 2.33}, + {"x": 8, "y": 1.42, "matrix": [5, 0]}, + {"x": 9, "y": 1.28, "matrix": [5, 1]}, + {"x": 10, "y": 1, "matrix": [5, 2]}, + {"x": 11, "y": 1.31, "matrix": [5, 3]}, + {"x": 12, "y": 2.33, "matrix": [5, 4]}, - {"x": 0, "y": 3.33}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"x": 0, "y": 3.33, "matrix": [2, 0]}, + {"x": 1, "y": 2.31, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2.28, "matrix": [2, 3]}, + {"x": 4, "y": 2.42, "matrix": [2, 4]}, - {"x": 8, "y": 2.42}, - {"x": 9, "y": 2.28}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2.31}, - {"x": 12, "y": 3.33}, + {"x": 8, "y": 2.42, "matrix": [6, 0]}, + {"x": 9, "y": 2.28, "matrix": [6, 1]}, + {"x": 10, "y": 2, "matrix": [6, 2]}, + {"x": 11, "y": 2.31, "matrix": [6, 3]}, + {"x": 12, "y": 3.33, "matrix": [6, 4]}, - {"x": 4, "y": 3.75}, - {"x": 5, "y": 4}, + {"x": 4, "y": 3.75, "matrix": [3, 0]}, + {"x": 5, "y": 4, "matrix": [3, 1]}, - {"x": 7, "y": 4}, - {"x": 8, "y": 3.75} + {"x": 7, "y": 4, "matrix": [7, 0]}, + {"x": 8, "y": 3.75, "matrix": [7, 1]} ] } } diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index 824419580c..4986a5974f 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -25,19 +25,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Mute", "x":2, "y":0}, - {"label":"Enter", "x":0, "y":1}, - {"label":"KC_0", "x":1, "y":1}, - {"label":"BackSpace", "x":2, "y":1}, - {"label":"KC_7", "x":0, "y":2}, - {"label":"KC_8", "x":1, "y":2}, - {"label":"KC_9", "x":2, "y":2}, - {"label":"KC_4", "x":0, "y":3}, - {"label":"KC_5", "x":1, "y":3}, - {"label":"KC_6", "x":2, "y":3}, - {"label":"KC_1", "x":0, "y":4}, - {"label":"KC_2", "x":1, "y":4}, - {"label":"KC_3", "x":2, "y":4} + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":0, "y":4, "matrix": [4, 0]}, + {"x":1, "y":4, "matrix": [4, 1]}, + {"x":2, "y":4, "matrix": [4, 2]} ] } } diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c index a82a2dabb1..5cffdc6c97 100644 --- a/keyboards/adafruit/macropad/macropad.c +++ b/keyboards/adafruit/macropad/macropad.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "macropad.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/adafruit/macropad/macropad.h b/keyboards/adafruit/macropad/macropad.h deleted file mode 100644 index 6e2e3524b7..0000000000 --- a/keyboards/adafruit/macropad/macropad.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com> - * - * 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" - -#define ___ KC_NO - -// clang-format off - #define LAYOUT( \ - K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32, \ - K40, K41, K42 \ - ) \ - { \ - { ___, ___, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 }, \ - { K40, K41, K42 } \ - } -// clang-format on diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index 1bd66e9ef0..cb85035a22 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -52,7 +52,7 @@ "layouts": { "LAYOUT_k1": { "layout": [ - { "label":"Mute", "x": 0, "y": 0 } + { "x": 0, "y": 0, "matrix": [0, 0] } ] } }, diff --git a/keyboards/anavi/knob1/knob1.c b/keyboards/anavi/knob1/knob1.c index cfc3ac8a65..c1ed7b7726 100644 --- a/keyboards/anavi/knob1/knob1.c +++ b/keyboards/anavi/knob1/knob1.c @@ -1,7 +1,7 @@ // Copyright 2022 Leon Anavi <leon@anavi.org> // SPDX-License-Identifier: GPL-2.0-or-later -#include "encoder.h" +#include "quantum.h" #include <stdio.h> void keyboard_post_init_kb(void) { diff --git a/keyboards/anavi/knob1/knob1.h b/keyboards/anavi/knob1/knob1.h deleted file mode 100644 index c48170928c..0000000000 --- a/keyboards/anavi/knob1/knob1.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2022 Leon Anavi <leon@anavi.org> - * - * 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" - -#define ___ KC_NO - -// clang-format off - #define LAYOUT_k1( \ - K02 \ - ) \ - { \ - { K02 } \ - } -// clang-format on diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json index 51e805059d..b152a7c1f1 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/info.json @@ -18,7 +18,16 @@ }, "layouts": { "LAYOUT_ortho_2x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + "layout": [ + {"x":0, "y":0, "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":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]} + ] } } } diff --git a/keyboards/anavi/macropad8/macropad8.c b/keyboards/anavi/macropad8/macropad8.c deleted file mode 100644 index 2859cd042d..0000000000 --- a/keyboards/anavi/macropad8/macropad8.c +++ /dev/null @@ -1 +0,0 @@ -#include "macropad8.h" diff --git a/keyboards/anavi/macropad8/macropad8.h b/keyboards/anavi/macropad8/macropad8.h deleted file mode 100644 index 3ebee830d3..0000000000 --- a/keyboards/anavi/macropad8/macropad8.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_2x4( \ - k01, k02, k03, k04, \ - k05, k06, k07, k08 \ - ) { \ - { k01, k02, k03, k04 }, \ - { k05, k06, k07, k08 } \ -} diff --git a/keyboards/arrayperipherals/1x4p1/1x4p1.c b/keyboards/arrayperipherals/1x4p1/1x4p1.c deleted file mode 100644 index 788ccff553..0000000000 --- a/keyboards/arrayperipherals/1x4p1/1x4p1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 David Doan - -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/>. -*/ - -#include "1x4p1.h" diff --git a/keyboards/arrayperipherals/1x4p1/1x4p1.h b/keyboards/arrayperipherals/1x4p1/1x4p1.h deleted file mode 100644 index 8f385a9086..0000000000 --- a/keyboards/arrayperipherals/1x4p1/1x4p1.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 David Doan - -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" - -#define LAYOUT_ortho_1x5( \ - k01, k02, k03, k04, k05\ - ) { \ - { k01, k02, k03, k04, k05} \ -} diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index 0441646af0..b124b20334 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -18,11 +18,11 @@ "layouts": { "LAYOUT_ortho_1x5": { "layout": [ - {"label": "K01", "x":0, "y":0}, - {"label": "K02", "x":1, "y":0}, - {"label": "K03", "x":2, "y":0}, - {"label": "K04", "x":3, "y":0}, - {"label": "K05", "x":4, "y":0} + {"x":0, "y":0, "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]} ] } } diff --git a/keyboards/botanicalkeyboards/fm2u/fm2u.c b/keyboards/botanicalkeyboards/fm2u/fm2u.c deleted file mode 100644 index 9729e5eec0..0000000000 --- a/keyboards/botanicalkeyboards/fm2u/fm2u.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 mechmerlin - * - * 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/>. - */ - -#include "fm2u.h" diff --git a/keyboards/botanicalkeyboards/fm2u/fm2u.h b/keyboards/botanicalkeyboards/fm2u/fm2u.h deleted file mode 100644 index 8316803259..0000000000 --- a/keyboards/botanicalkeyboards/fm2u/fm2u.h +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2020 mechmerlin - * - * 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_1u( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_1u25( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_1u5( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_1u75( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_2u( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_2u25( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_2u75( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_3u( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_6u( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_6u25( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_7u( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT_isoenter( \ - k00 \ -) { \ - { k00 } \ -} - -// Backward compatibility TODO: remove these -#define LAYOUT_100u LAYOUT_1u -#define LAYOUT_125u LAYOUT_1u25 -#define LAYOUT_150u LAYOUT_1u5 -#define LAYOUT_175u LAYOUT_1u75 -#define LAYOUT_200u LAYOUT_2u -#define LAYOUT_225u LAYOUT_2u25 -#define LAYOUT_275u LAYOUT_2u75 -#define LAYOUT_300u LAYOUT_3u -#define LAYOUT_600u LAYOUT_6u -#define LAYOUT_625u LAYOUT_6u25 -#define LAYOUT_700u LAYOUT_7u -#define LAYOUT_iso LAYOUT_isoenter diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/info.json index 09d617152b..0d4dd1e88b 100644 --- a/keyboards/botanicalkeyboards/fm2u/info.json +++ b/keyboards/botanicalkeyboards/fm2u/info.json @@ -15,65 +15,79 @@ ["C4"] ] }, + "layout_aliases": { + "LAYOUT_100u": "LAYOUT_1u", + "LAYOUT_125u": "LAYOUT_1u25", + "LAYOUT_150u": "LAYOUT_1u5", + "LAYOUT_175u": "LAYOUT_1u75", + "LAYOUT_200u": "LAYOUT_2u", + "LAYOUT_225u": "LAYOUT_2u25", + "LAYOUT_275u": "LAYOUT_2u75", + "LAYOUT_300u": "LAYOUT_3u", + "LAYOUT_600u": "LAYOUT_6u", + "LAYOUT_625u": "LAYOUT_6u25", + "LAYOUT_700u": "LAYOUT_7u", + "LAYOUT_iso": "LAYOUT_isoenter" + }, "layouts": { "LAYOUT_1u": { "layout": [ - {"x": 0, "y": 0} + {"x": 0, "y": 0, "matrix": [0, 0]} ] }, "LAYOUT_1u25": { "layout": [ - {"x": 0, "y": 0, "w": 1.25} + {"x": 0, "y": 0, "w": 1.25, "matrix": [0, 0]} ] }, "LAYOUT_1u5": { "layout": [ - {"x": 0, "y": 0, "w": 1.50} + {"x": 0, "y": 0, "w": 1.50, "matrix": [0, 0]} ] }, "LAYOUT_1u75": { "layout": [ - {"x": 0, "y": 0, "w": 1.75} + {"x": 0, "y": 0, "w": 1.75, "matrix": [0, 0]} ] }, "LAYOUT_2u": { "layout": [ - {"x": 0, "y": 0, "w": 2} + {"x": 0, "y": 0, "w": 2, "matrix": [0, 0]} ] }, "LAYOUT_2u25": { "layout": [ - {"x": 0, "y": 0, "w": 2.25} + {"x": 0, "y": 0, "w": 2.25, "matrix": [0, 0]} ] }, "LAYOUT_2u75": { "layout": [ - {"x": 0, "y": 0, "w": 2.75} + {"x": 0, "y": 0, "w": 2.75, "matrix": [0, 0]} ] }, "LAYOUT_3u": { "layout": [ - {"x": 0, "y": 0, "w": 3} + {"x": 0, "y": 0, "w": 3, "matrix": [0, 0]} ] }, "LAYOUT_6u": { "layout": [ - {"x": 0, "y": 0, "w": 6} + {"x": 0, "y": 0, "w": 6, "matrix": [0, 0]} ] }, "LAYOUT_6u25": { "layout": [ - {"x": 0, "y": 0, "w": 6.25} + {"x": 0, "y": 0, "w": 6.25, "matrix": [0, 0]} ] }, "LAYOUT_7u": { "layout": [ - {"x": 0, "y": 0, "w": 7} + {"x": 0, "y": 0, "w": 7, "matrix": [0, 0]} ] }, "LAYOUT_isoenter": { "layout": [ - {"x": 0.25, "y": 0, "w": 1.25, "h": 2} + {"x": 0.25, "y": 0, "w": 1.25, "h": 2, "matrix": [0, 0]} ] } } diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/info.json index 9f3637be0b..a6ab63f6ae 100644 --- a/keyboards/bpiphany/sixshooter/info.json +++ b/keyboards/bpiphany/sixshooter/info.json @@ -18,7 +18,14 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]} + ] } } } diff --git a/keyboards/bpiphany/sixshooter/sixshooter.h b/keyboards/bpiphany/sixshooter/sixshooter.h index 33ac9335e6..0d93c455ef 100644 --- a/keyboards/bpiphany/sixshooter/sixshooter.h +++ b/keyboards/bpiphany/sixshooter/sixshooter.h @@ -2,14 +2,6 @@ #include "quantum.h" -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 } \ -} - inline void sixshooter_led_0_on(void) { DDRB |= (1<<6); PORTB |= (1<<6); } inline void sixshooter_led_1_on(void) { DDRC |= (1<<7); PORTC |= (1<<7); } inline void sixshooter_led_2_on(void) { DDRD |= (1<<0); PORTD |= (1<<0); } diff --git a/keyboards/clueboard/california/california.c b/keyboards/clueboard/california/california.c deleted file mode 100644 index 342184a1ae..0000000000 --- a/keyboards/clueboard/california/california.c +++ /dev/null @@ -1 +0,0 @@ -#include "california.h" diff --git a/keyboards/clueboard/california/california.h b/keyboards/clueboard/california/california.h deleted file mode 100644 index ef5b3f3e04..0000000000 --- a/keyboards/clueboard/california/california.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "quantum.h" diff --git a/keyboards/crypt_macro/crypt_macro.c b/keyboards/crypt_macro/crypt_macro.c deleted file mode 100644 index 32f8d0bf28..0000000000 --- a/keyboards/crypt_macro/crypt_macro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Yiancar-Designs - * - * 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/>. - */ -#include "crypt_macro.h" diff --git a/keyboards/crypt_macro/crypt_macro.h b/keyboards/crypt_macro/crypt_macro.h deleted file mode 100644 index d128db4dff..0000000000 --- a/keyboards/crypt_macro/crypt_macro.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2022 Yiancar-Designs - * - * 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 - -#define XXX KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K11 \ -) { \ - { K00, K01, K02 }, \ - { XXX, K11, XXX } \ -} diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index 910777b90c..c26bf041fa 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -18,7 +18,12 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0.5, "y":1, "w":2, "matrix": [1, 1]} + ] } } } diff --git a/keyboards/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/info.json index 02d503424d..1aed397e38 100644 --- a/keyboards/dailycraft/owl8/info.json +++ b/keyboards/dailycraft/owl8/info.json @@ -18,25 +18,25 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0, "matrix": [0, 12]}, + {"x":1, "y":0, "matrix": [0, 13]}, + {"x":2, "y":0, "matrix": [0, 14]}, + {"x":3, "y":0, "matrix": [0, 15]}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, + {"x":0, "y":1.25, "matrix": [0, 8]}, + {"x":1, "y":1.25, "matrix": [0, 9]}, + {"x":2, "y":1.25, "matrix": [0, 10]}, + {"x":3, "y":1.25, "matrix": [0, 11]}, - {"x":0, "y":2.5}, - {"x":1, "y":2.5}, - {"x":2, "y":2.5}, - {"x":3, "y":2.5}, + {"x":0, "y":2.5, "matrix": [0, 0]}, + {"x":1, "y":2.5, "matrix": [0, 1]}, + {"x":2, "y":2.5, "matrix": [0, 2]}, + {"x":3, "y":2.5, "matrix": [0, 3]}, - {"x":0, "y":3.5}, - {"x":1, "y":3.5}, - {"x":2, "y":3.5}, - {"x":3, "y":3.5} + {"x":0, "y":3.5, "matrix": [0, 4]}, + {"x":1, "y":3.5, "matrix": [0, 5]}, + {"x":2, "y":3.5, "matrix": [0, 6]}, + {"x":3, "y":3.5, "matrix": [0, 7]} ] } } diff --git a/keyboards/dailycraft/owl8/owl8.c b/keyboards/dailycraft/owl8/owl8.c deleted file mode 100644 index a31289891a..0000000000 --- a/keyboards/dailycraft/owl8/owl8.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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/>. - */ - -#include "owl8.h" diff --git a/keyboards/dailycraft/owl8/owl8.h b/keyboards/dailycraft/owl8/owl8.h deleted file mode 100644 index 5e561f580c..0000000000 --- a/keyboards/dailycraft/owl8/owl8.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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( \ - k012, k013, k014, k015, \ - k008, k009, k010, k011, \ - k000, k001, k002, k003, \ - k004, k005, k006, k007 \ -) \ -{ \ - {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 } \ -} diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json index 95d3539456..69dc1479a4 100644 --- a/keyboards/dailycraft/stickey4/info.json +++ b/keyboards/dailycraft/stickey4/info.json @@ -18,15 +18,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, - {"label": "Encoder 1 CCW", "x": 0, "y": 1}, - {"label": "Encoder 1 CW", "x": 1, "y": 1}, - {"label": "Encoder 2 CCW", "x": 2, "y": 1}, - {"label": "Encoder 2 CW", "x": 3, "y": 1} + {"label": "Encoder 1 CCW", "x": 0, "y": 1, "matrix": [0, 4]}, + {"label": "Encoder 1 CW", "x": 1, "y": 1, "matrix": [0, 5]}, + {"label": "Encoder 2 CCW", "x": 2, "y": 1, "matrix": [0, 6]}, + {"label": "Encoder 2 CW", "x": 3, "y": 1, "matrix": [0, 7]} ] } } diff --git a/keyboards/dailycraft/stickey4/stickey4.c b/keyboards/dailycraft/stickey4/stickey4.c deleted file mode 100644 index dd0ac4f5f2..0000000000 --- a/keyboards/dailycraft/stickey4/stickey4.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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/>. - */ - -#include "stickey4.h" diff --git a/keyboards/dailycraft/stickey4/stickey4.h b/keyboards/dailycraft/stickey4/stickey4.h deleted file mode 100644 index 6a21a8f991..0000000000 --- a/keyboards/dailycraft/stickey4/stickey4.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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, k06, k07 \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07 } \ -} diff --git a/keyboards/dekunukem/duckypad/duckypad.c b/keyboards/dekunukem/duckypad/duckypad.c index 5cadebd95e..d03d284b95 100644 --- a/keyboards/dekunukem/duckypad/duckypad.c +++ b/keyboards/dekunukem/duckypad/duckypad.c @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "duckypad.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/dekunukem/duckypad/duckypad.h b/keyboards/dekunukem/duckypad/duckypad.h deleted file mode 100644 index 984eb9cdaf..0000000000 --- a/keyboards/dekunukem/duckypad/duckypad.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - -QMK Firmware for dekuNukem/duckyPad - -Copyright (C) 2020 Anthony Som - -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 3 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" - -#define LAYOUT( \ - k00, k01, k02, \ - k03, k04, k05, \ - k06, k07, k08, \ - k09, k010, k011, \ - k012, k013, k014, \ - k015, k016 \ -) {{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, k015, k016}} diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json index 06c2727080..a8dbe2e5b5 100644 --- a/keyboards/dekunukem/duckypad/info.json +++ b/keyboards/dekunukem/duckypad/info.json @@ -18,23 +18,23 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4} + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 0, "y": 1, "matrix": [0, 3]}, + {"x": 1, "y": 1, "matrix": [0, 4]}, + {"x": 2, "y": 1, "matrix": [0, 5]}, + {"x": 0, "y": 2, "matrix": [0, 6]}, + {"x": 1, "y": 2, "matrix": [0, 7]}, + {"x": 2, "y": 2, "matrix": [0, 8]}, + {"x": 0, "y": 3, "matrix": [0, 9]}, + {"x": 1, "y": 3, "matrix": [0, 10]}, + {"x": 2, "y": 3, "matrix": [0, 11]}, + {"x": 0, "y": 4, "matrix": [0, 12]}, + {"x": 1, "y": 4, "matrix": [0, 13]}, + {"x": 2, "y": 4, "matrix": [0, 14]}, + {"x": 3, "y": 4, "matrix": [0, 15]}, + {"x": 4, "y": 4, "matrix": [0, 16]} ] } } diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index c3a9971bae..0738a0491f 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json @@ -7,5 +7,53 @@ "device_version": "0.0.1" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "community_layouts": ["split_3x5_2"], + "layouts": { + "LAYOUT_split_3x5_2": { + "layout": [ + {"x": 0, "y": 0.93}, + {"x": 1, "y": 0.31}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0.28}, + {"x": 4, "y": 0.42}, + + {"x": 7, "y": 0.42}, + {"x": 8, "y": 0.28}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0.31}, + {"x": 11, "y": 0.93}, + + {"x": 0, "y": 1.93}, + {"x": 1, "y": 1.31}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1.28}, + {"x": 4, "y": 1.42}, + + {"x": 7, "y": 1.42}, + {"x": 8, "y": 1.28}, + {"x": 9, "y": 1}, + {"x": 10, "y": 1.31}, + {"x": 11, "y": 1.93}, + + {"x": 0, "y": 2.93}, + {"x": 1, "y": 2.31}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2.28}, + {"x": 4, "y": 2.42}, + + {"x": 7, "y": 2.42}, + {"x": 8, "y": 2.28}, + {"x": 9, "y": 2}, + {"x": 10, "y": 2.31}, + {"x": 11, "y": 2.93}, + + {"x": 3.5, "y": 3.75}, + {"x": 4.5, "y": 4}, + + {"x": 6.5, "y": 4}, + {"x": 7.5, "y": 3.75} + ] + } + } } diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index c0f7b92dfa..f2b6b4b07b 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -5,5 +5,53 @@ "device_version": "0.0.2" }, "processor": "STM32F072", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "community_layouts": ["split_3x5_2"], + "layouts": { + "LAYOUT_split_3x5_2": { + "layout": [ + {"x": 0, "y": 0.93}, + {"x": 1, "y": 0.31}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0.28}, + {"x": 4, "y": 0.42}, + + {"x": 7, "y": 0.42}, + {"x": 8, "y": 0.28}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0.31}, + {"x": 11, "y": 0.93}, + + {"x": 0, "y": 1.93}, + {"x": 1, "y": 1.31}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1.28}, + {"x": 4, "y": 1.42}, + + {"x": 7, "y": 1.42}, + {"x": 8, "y": 1.28}, + {"x": 9, "y": 1}, + {"x": 10, "y": 1.31}, + {"x": 11, "y": 1.93}, + + {"x": 0, "y": 2.93}, + {"x": 1, "y": 2.31}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2.28}, + {"x": 4, "y": 2.42}, + + {"x": 7, "y": 2.42}, + {"x": 8, "y": 2.28}, + {"x": 9, "y": 2}, + {"x": 10, "y": 2.31}, + {"x": 11, "y": 2.93}, + + {"x": 3.5, "y": 3.75}, + {"x": 4.5, "y": 4}, + + {"x": 6.5, "y": 4}, + {"x": 7.5, "y": 3.75} + ] + } + } } diff --git a/keyboards/ferris/info.json b/keyboards/ferris/info.json index 6ee469ed7b..eea6a0abfb 100644 --- a/keyboards/ferris/info.json +++ b/keyboards/ferris/info.json @@ -1,52 +1,4 @@ { "url": "https://github.com/pierrechevalier83/ferris/", - "maintainer": "@pierrec83", - "community_layouts": ["split_3x5_2"], - "layouts": { - "LAYOUT_split_3x5_2": { - "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, - - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, - - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, - - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, - - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, - - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, - - {"x": 3.5, "y": 3.75}, - {"x": 4.5, "y": 4}, - - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 3.75} - ] - } - } + "maintainer": "@pierrec83" } diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json index 171b754476..3e3eeffe76 100644 --- a/keyboards/ferris/sweep/info.json +++ b/keyboards/ferris/sweep/info.json @@ -31,5 +31,56 @@ ] } } + }, + "community_layouts": ["split_3x5_2"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_2" + }, + "layouts": { + "LAYOUT_split_3x5_2": { + "layout": [ + {"x": 0, "y": 0.93, "matrix": [0, 0]}, + {"x": 1, "y": 0.31, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0.28, "matrix": [0, 3]}, + {"x": 4, "y": 0.42, "matrix": [0, 4]}, + + {"x": 7, "y": 0.42, "matrix": [4, 0]}, + {"x": 8, "y": 0.28, "matrix": [4, 1]}, + {"x": 9, "y": 0, "matrix": [4, 2]}, + {"x": 10, "y": 0.31, "matrix": [4, 3]}, + {"x": 11, "y": 0.93, "matrix": [4, 4]}, + + {"x": 0, "y": 1.93, "matrix": [1, 0]}, + {"x": 1, "y": 1.31, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1.28, "matrix": [1, 3]}, + {"x": 4, "y": 1.42, "matrix": [1, 4]}, + + {"x": 7, "y": 1.42, "matrix": [5, 0]}, + {"x": 8, "y": 1.28, "matrix": [5, 1]}, + {"x": 9, "y": 1, "matrix": [5, 2]}, + {"x": 10, "y": 1.31, "matrix": [5, 3]}, + {"x": 11, "y": 1.93, "matrix": [5, 4]}, + + {"x": 0, "y": 2.93, "matrix": [2, 0]}, + {"x": 1, "y": 2.31, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2.28, "matrix": [2, 3]}, + {"x": 4, "y": 2.42, "matrix": [2, 4]}, + + {"x": 7, "y": 2.42, "matrix": [6, 0]}, + {"x": 8, "y": 2.28, "matrix": [6, 1]}, + {"x": 9, "y": 2, "matrix": [6, 2]}, + {"x": 10, "y": 2.31, "matrix": [6, 3]}, + {"x": 11, "y": 2.93, "matrix": [6, 4]}, + + {"x": 3.5, "y": 3.75, "matrix": [3, 0]}, + {"x": 4.5, "y": 4, "matrix": [3, 1]}, + + {"x": 6.5, "y": 4, "matrix": [7, 0]}, + {"x": 7.5, "y": 3.75, "matrix": [7, 1]} + ] + } } } diff --git a/keyboards/ferris/sweep/sweep.c b/keyboards/ferris/sweep/sweep.c index 98467f18ae..0d63f80cc1 100644 --- a/keyboards/ferris/sweep/sweep.c +++ b/keyboards/ferris/sweep/sweep.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "sweep.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/ferris/sweep/sweep.h b/keyboards/ferris/sweep/sweep.h deleted file mode 100644 index ebfa4ede1d..0000000000 --- a/keyboards/ferris/sweep/sweep.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.com> - * - * 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/>. - */ - -#include "quantum.h" - -/* This 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. - */ - -// readability -#define ___ KC_NO - -#define LAYOUT_split_3x5_2( \ - L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ - L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ - L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ - L16, L17, R16, R17 \ - ) \ - { \ - { L01, L02, L03, L04, L05 }, \ - { L06, L07, L08, L09, L10 }, \ - { L11, L12, L13, L14, L15 }, \ - { L16, L17, ___, ___ , ___}, \ - { R01, R02, R03, R04, R05 }, \ - { R06, R07, R08, R09, R10 }, \ - { R11, R12, R13, R14, R15 }, \ - { R16, R17, ___, ___, ___ } \ - } - -#define LAYOUT LAYOUT_split_3x5_2 diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index b84877a8dc..5bb1cc5ee8 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT_ortho_2x4": { "layout": [ - {"label": "K0", "x": 0, "y": 0}, - {"label": "K1", "x": 1, "y": 0}, - {"label": "K2", "x": 2, "y": 0}, - {"label": "K3", "x": 3, "y": 0}, + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, - {"label": "K4", "x": 0, "y": 1}, - {"label": "K5", "x": 1, "y": 1}, - {"label": "K6", "x": 2, "y": 1}, - {"label": "K7", "x": 3, "y": 1} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]} ] } } diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.c b/keyboards/geekboards/macropad_v2/macropad_v2.c index df8581cc58..191290d3fa 100644 --- a/keyboards/geekboards/macropad_v2/macropad_v2.c +++ b/keyboards/geekboards/macropad_v2/macropad_v2.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include QMK_KEYBOARD_H +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.h b/keyboards/geekboards/macropad_v2/macropad_v2.h deleted file mode 100644 index 7fe684deb7..0000000000 --- a/keyboards/geekboards/macropad_v2/macropad_v2.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de) - * - * 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" - -#define LAYOUT_ortho_2x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 } \ -} diff --git a/keyboards/handwired/aball/aball.c b/keyboards/handwired/aball/aball.c deleted file mode 100644 index 3f12243ac6..0000000000 --- a/keyboards/handwired/aball/aball.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Richard Sutherland - * - * 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/>. - */ - -#include "aball.h" diff --git a/keyboards/handwired/aball/aball.h b/keyboards/handwired/aball/aball.h deleted file mode 100644 index d6cb21bafc..0000000000 --- a/keyboards/handwired/aball/aball.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Richard Sutherland - * - * 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" - -#define LAYOUT(k00) {{ k00 }} diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json index 84d277c136..a90a831f8a 100644 --- a/keyboards/handwired/aball/info.json +++ b/keyboards/handwired/aball/info.json @@ -18,7 +18,7 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0} + {"x":0, "y":0, "matrix": [0, 0]} ] } } diff --git a/keyboards/handwired/bdn9_ble/bdn9_ble.c b/keyboards/handwired/bdn9_ble/bdn9_ble.c deleted file mode 100644 index 75fe7fff71..0000000000 --- a/keyboards/handwired/bdn9_ble/bdn9_ble.c +++ /dev/null @@ -1 +0,0 @@ -#include "bdn9_ble.h" diff --git a/keyboards/handwired/bdn9_ble/bdn9_ble.h b/keyboards/handwired/bdn9_ble/bdn9_ble.h deleted file mode 100644 index 8a45113264..0000000000 --- a/keyboards/handwired/bdn9_ble/bdn9_ble.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 Danny Nguyen <danny@keeb.io> - * - * 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 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( \ - KA1, KA2, KA3, \ - KB1, KB2, KB3, \ - KC1, KC2, KC3 \ -) \ -{ \ - { KA1, KA2, KA3 }, \ - { KB1, KB2, KB3 }, \ - { KC1, KC2, KC3 } \ -} diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json index 359939713a..303e26ba05 100644 --- a/keyboards/handwired/bdn9_ble/info.json +++ b/keyboards/handwired/bdn9_ble/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/handwired/bento/bento.c b/keyboards/handwired/bento/bento.c deleted file mode 100644 index 904e0e5b65..0000000000 --- a/keyboards/handwired/bento/bento.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 GhostSeven <work@ghost7.com> - * - * 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/>. - */ -#include "bento.h" diff --git a/keyboards/handwired/bento/bento.h b/keyboards/handwired/bento/bento.h deleted file mode 100644 index 106882860a..0000000000 --- a/keyboards/handwired/bento/bento.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 GhostSeven <work@ghost7.com> - * - * 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 - -#ifdef KEYBOARD_handwired_bento_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json index 2b3012b399..057931bb4e 100644 --- a/keyboards/handwired/bento/rev1/info.json +++ b/keyboards/handwired/bento/rev1/info.json @@ -19,12 +19,12 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]} ] } } diff --git a/keyboards/handwired/bento/rev1/rev1.c b/keyboards/handwired/bento/rev1/rev1.c index 4ab5dc2fd0..1dd5b683f1 100644 --- a/keyboards/handwired/bento/rev1/rev1.c +++ b/keyboards/handwired/bento/rev1/rev1.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "rev1.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/handwired/bento/rev1/rev1.h b/keyboards/handwired/bento/rev1/rev1.h deleted file mode 100644 index a0b8ce2796..0000000000 --- a/keyboards/handwired/bento/rev1/rev1.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 GhostSeven <work@ghost7.com> - * - * 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 "bento.h" -#include "quantum.h" - -/* This 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( \ - KA1, KA2, KA3, \ - KB1, KB2, KB3 \ -) \ -{ \ - { KA1, KA2, KA3 }, \ - { KB1, KB2, KB3 } \ -} diff --git a/keyboards/handwired/dc/mc/001/001.c b/keyboards/handwired/dc/mc/001/001.c deleted file mode 100644 index 4745469fd6..0000000000 --- a/keyboards/handwired/dc/mc/001/001.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Daniel Cormier - * - * 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/>. - */ - -#include "001.h" diff --git a/keyboards/handwired/dc/mc/001/001.h b/keyboards/handwired/dc/mc/001/001.h deleted file mode 100644 index 317655162e..0000000000 --- a/keyboards/handwired/dc/mc/001/001.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Daniel Cormier - * - * 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 \ -) { \ - { k00, k01, k02, k03, k04 } \ -} diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json index d14c92150b..78c75f3713 100644 --- a/keyboards/handwired/dc/mc/001/info.json +++ b/keyboards/handwired/dc/mc/001/info.json @@ -22,11 +22,11 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Mute", "x": 0, "y": 0}, - {"label": "Stop", "x": 1, "y": 0}, - {"label": "Previous", "x": 2, "y": 0}, - {"label": "Next", "x": 3, "y": 0}, - {"label": "Play/Pause", "x": 4, "y": 0} + {"x": 0, "y": 0, "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]} ] } } diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/info.json index 9cbcf4f4f7..4655cde341 100644 --- a/keyboards/handwired/lemonpad/info.json +++ b/keyboards/handwired/lemonpad/info.json @@ -19,13 +19,13 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, - {"label": "k10", "x": 0, "y": 1}, - {"label": "k11", "x": 1, "y": 1}, - {"label": "k12", "x": 2, "y": 1} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]} ] } } diff --git a/keyboards/handwired/lemonpad/lemonpad.c b/keyboards/handwired/lemonpad/lemonpad.c deleted file mode 100644 index cb5c1461a5..0000000000 --- a/keyboards/handwired/lemonpad/lemonpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 dari-studios (@dari-studios) - * - * 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/>. - */ - -#include "lemonpad.h" diff --git a/keyboards/handwired/lemonpad/lemonpad.h b/keyboards/handwired/lemonpad/lemonpad.h deleted file mode 100644 index 8f9b64c19a..0000000000 --- a/keyboards/handwired/lemonpad/lemonpad.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 dari-studios (@dari-studios) - * - * 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. - */ - -//Top 3 on the usb port side, bottom 3 on the opposite side - -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ -} diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.c b/keyboards/handwired/stream_cheap/2x3/2x3.c deleted file mode 100644 index 6889747873..0000000000 --- a/keyboards/handwired/stream_cheap/2x3/2x3.c +++ /dev/null @@ -1 +0,0 @@ -#include "2x3.h" diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.h b/keyboards/handwired/stream_cheap/2x3/2x3.h deleted file mode 100644 index 12e9a46096..0000000000 --- a/keyboards/handwired/stream_cheap/2x3/2x3.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_2x3( \ - K00, K01, K02, \ - K03, K04, K05 \ -) { \ - { K00, K01, K02}, \ - { K03, K04, K05} \ -} diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json index 555d9540af..937d462918 100644 --- a/keyboards/handwired/stream_cheap/2x3/info.json +++ b/keyboards/handwired/stream_cheap/2x3/info.json @@ -20,12 +20,12 @@ "layouts": { "LAYOUT_ortho_2x3": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":0, "y":1}, - {"label":"K04", "x":1, "y":1}, - {"label":"K05", "x":2, "y":1} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]} ] } } diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.c b/keyboards/handwired/stream_cheap/2x4/2x4.c deleted file mode 100644 index a0519d21b7..0000000000 --- a/keyboards/handwired/stream_cheap/2x4/2x4.c +++ /dev/null @@ -1 +0,0 @@ -#include "2x4.h" diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.h b/keyboards/handwired/stream_cheap/2x4/2x4.h deleted file mode 100644 index 37d37af728..0000000000 --- a/keyboards/handwired/stream_cheap/2x4/2x4.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_2x4(\ - K00, K01, K02, K03, \ - K04, K05, K06, K07 \ -) \ - { \ - { K00,K01,K02,K03}, \ - { K04,K05,K06,K07} \ -} diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json index d298a30c14..1e67a91d48 100644 --- a/keyboards/handwired/stream_cheap/2x4/info.json +++ b/keyboards/handwired/stream_cheap/2x4/info.json @@ -19,14 +19,14 @@ "layouts": { "LAYOUT_ortho_2x4": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":0, "y":1}, - {"label":"K05", "x":1, "y":1}, - {"label":"K06", "x":2, "y":1}, - {"label":"K07", "x":3, "y":1} + {"x":0, "y":0, "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":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]} ] } } diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.c b/keyboards/handwired/stream_cheap/2x5/2x5.c deleted file mode 100644 index 70969a316a..0000000000 --- a/keyboards/handwired/stream_cheap/2x5/2x5.c +++ /dev/null @@ -1 +0,0 @@ -#include "2x5.h" diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.h b/keyboards/handwired/stream_cheap/2x5/2x5.h deleted file mode 100644 index f01c8302a2..0000000000 --- a/keyboards/handwired/stream_cheap/2x5/2x5.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_2x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 } \ -} diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json index 3a81177f31..4bfe269ee6 100644 --- a/keyboards/handwired/stream_cheap/2x5/info.json +++ b/keyboards/handwired/stream_cheap/2x5/info.json @@ -19,16 +19,16 @@ "layouts": { "LAYOUT_ortho_2x5": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K10", "x":0, "y":1}, - {"label":"K11", "x":1, "y":1}, - {"label":"K12", "x":2, "y":1}, - {"label":"K13", "x":3, "y":1}, - {"label":"K14", "x":4, "y":1} + {"x":0, "y":0, "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":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, + {"x":4, "y":1, "matrix": [1, 4]} ] } } diff --git a/keyboards/ianklug/grooveboard/grooveboard.c b/keyboards/ianklug/grooveboard/grooveboard.c deleted file mode 100644 index 711e9f301d..0000000000 --- a/keyboards/ianklug/grooveboard/grooveboard.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 ianklug - * - * 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/>. - */ - -#include "grooveboard.h" diff --git a/keyboards/ianklug/grooveboard/grooveboard.h b/keyboards/ianklug/grooveboard/grooveboard.h deleted file mode 100644 index 51f519e8a0..0000000000 --- a/keyboards/ianklug/grooveboard/grooveboard.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 ianklug - * - * 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 \ -) { \ - { k00, k01, k02, k03 } \ -} diff --git a/keyboards/ianklug/grooveboard/info.json b/keyboards/ianklug/grooveboard/info.json index a885514071..bf4cadae84 100644 --- a/keyboards/ianklug/grooveboard/info.json +++ b/keyboards/ianklug/grooveboard/info.json @@ -18,10 +18,10 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0, "w": 1, "h": 1}, - {"label": "k01", "x": 1, "y": 0, "w": 1, "h": 1}, - {"label": "k02", "x": 4, "y": 0, "w": 1, "h": 1}, - {"label": "k03", "x": 5, "y": 0, "w": 1, "h": 1} + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 4, "y": 0, "matrix": [0, 2]}, + {"x": 5, "y": 0, "matrix": [0, 3]} ] } } diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json index 262b12056d..6d108299d0 100644 --- a/keyboards/kb_elmo/isolation/info.json +++ b/keyboards/kb_elmo/isolation/info.json @@ -18,7 +18,7 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.25, "y":0, "w":1.25, "h":2} + {"x":0.25, "y":0, "w":1.25, "h":2, "matrix": [0, 0]} ] } } diff --git a/keyboards/kb_elmo/isolation/isolation.c b/keyboards/kb_elmo/isolation/isolation.c deleted file mode 100644 index 09b8c95541..0000000000 --- a/keyboards/kb_elmo/isolation/isolation.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 kb-elmo<mail@elmo.space> - * - * 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/>. - */ - -#include "isolation.h" diff --git a/keyboards/kb_elmo/isolation/isolation.h b/keyboards/kb_elmo/isolation/isolation.h deleted file mode 100644 index 580189ea25..0000000000 --- a/keyboards/kb_elmo/isolation/isolation.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 kb-elmo<mail@elmo.space> - * - * 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" - -#define LAYOUT( \ - k00 \ -) { \ - { k00 } \ -} diff --git a/keyboards/keebio/bamfk1/bamfk1.c b/keyboards/keebio/bamfk1/bamfk1.c deleted file mode 100644 index eddd7e624e..0000000000 --- a/keyboards/keebio/bamfk1/bamfk1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "bamfk1.h" diff --git a/keyboards/keebio/bamfk1/bamfk1.h b/keyboards/keebio/bamfk1/bamfk1.h deleted file mode 100644 index be1fd00808..0000000000 --- a/keyboards/keebio/bamfk1/bamfk1.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2021 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, e01, e02, \ - e01a, e01b, e02a, e02b \ -) { \ - { k00, e01, e02, KC_NO }, \ - { e01a, e01b, e02a, e02b } \ -} diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index 9390f7d56f..c39cbd3ce0 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -19,14 +19,14 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 1.5, "y": 0, "h":2, "w": 2}, - {"label": "k01", "x": 0.5, "y": 2.25}, - {"label": "k02", "x": 3.5, "y": 2.25}, + {"x": 1.5, "y": 0, "h":2, "w": 2, "matrix": [0, 0]}, + {"x": 0.5, "y": 2.25, "matrix": [0, 1]}, + {"x": 3.5, "y": 2.25, "matrix": [0, 2]}, - {"label": "k10", "x": 0, "y": 3.5}, - {"label": "k11", "x": 1, "y": 3.5}, - {"label": "k12", "x": 3, "y": 3.5}, - {"label": "k13", "x": 4, "y": 3.5} + {"x": 0, "y": 3.5, "matrix": [1, 0]}, + {"x": 1, "y": 3.5, "matrix": [1, 1]}, + {"x": 3, "y": 3.5, "matrix": [1, 2]}, + {"x": 4, "y": 3.5, "matrix": [1, 3]} ] } } diff --git a/keyboards/keebio/bdn9/bdn9.c b/keyboards/keebio/bdn9/bdn9.c deleted file mode 100644 index 0ff55fd6d4..0000000000 --- a/keyboards/keebio/bdn9/bdn9.c +++ /dev/null @@ -1 +0,0 @@ -#include "bdn9.h" diff --git a/keyboards/keebio/bdn9/bdn9.h b/keyboards/keebio/bdn9/bdn9.h deleted file mode 100644 index 94ba78a6ad..0000000000 --- a/keyboards/keebio/bdn9/bdn9.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_keebio_bdn9_rev1 - #include "rev1.h" -#elif KEYBOARD_keebio_bdn9_rev2 - #include "rev2.h" -#endif diff --git a/keyboards/keebio/bdn9/info.json b/keyboards/keebio/bdn9/info.json index 4bb378ea7a..19a0241234 100644 --- a/keyboards/keebio/bdn9/info.json +++ b/keyboards/keebio/bdn9/info.json @@ -8,15 +8,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/keebio/bdn9/rev1/rev1.c b/keyboards/keebio/bdn9/rev1/rev1.c index f064ca51df..567de03af4 100644 --- a/keyboards/keebio/bdn9/rev1/rev1.c +++ b/keyboards/keebio/bdn9/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/bdn9/rev1/rev1.h b/keyboards/keebio/bdn9/rev1/rev1.h deleted file mode 100644 index 9e04032d81..0000000000 --- a/keyboards/keebio/bdn9/rev1/rev1.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Danny Nguyen <danny@keeb.io> - * - * 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 "bdn9.h" -#include "quantum.h" - -/* This 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( \ - KA1, KA2, KA3, \ - KB1, KB2, KB3, \ - KC1, KC2, KC3 \ -) \ -{ \ - { KA1, KA2, KA3 }, \ - { KB1, KB2, KB3 }, \ - { KC1, KC2, KC3 } \ -} diff --git a/keyboards/keebio/bdn9/rev2/rev2.c b/keyboards/keebio/bdn9/rev2/rev2.c index 14b556823f..5c6d940325 100644 --- a/keyboards/keebio/bdn9/rev2/rev2.c +++ b/keyboards/keebio/bdn9/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "rev2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/bdn9/rev2/rev2.h b/keyboards/keebio/bdn9/rev2/rev2.h deleted file mode 100644 index 0f0603c1d6..0000000000 --- a/keyboards/keebio/bdn9/rev2/rev2.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Danny Nguyen <danny@keeb.io> - * - * 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 "bdn9.h" -#include "quantum.h" - -/* This 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( \ - KA1, KA2, KA3, \ - KB1, KB2, KB3, \ - KC1, KC2, KC3 \ -) \ -{ \ - { KA1, KA2, KA3 }, \ - { KB1, KB2, KB3 }, \ - { KC1, KC2, KC3 } \ -} diff --git a/keyboards/keebio/choconum/choconum.c b/keyboards/keebio/choconum/choconum.c deleted file mode 100644 index 5360a716d7..0000000000 --- a/keyboards/keebio/choconum/choconum.c +++ /dev/null @@ -1 +0,0 @@ -#include "choconum.h" diff --git a/keyboards/keebio/choconum/choconum.h b/keyboards/keebio/choconum/choconum.h deleted file mode 100644 index e77c5886ec..0000000000 --- a/keyboards/keebio/choconum/choconum.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 Keebio - * - * 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" - -#define LAYOUT_ortho_5x4( \ - KA1, KA2, KA3, KA4, \ - KB1, KB2, KB3, KB4, \ - KC1, KC2, KC3, KC4, \ - KD1, KD2, KD3, KD4, \ - KE1, KE2, KE3, KE4 \ -) \ -{ \ - { KA1, KA2, KA3, KA4 }, \ - { KB1, KB2, KB3, KB4 }, \ - { KC1, KC2, KC3, KC4 }, \ - { KD1, KD2, KD3, KD4 }, \ - { KE1, KE2, KE3, KE4 } \ -} - -#define LAYOUT_numpad_5x4( \ - KA1, KA2, KA3, KA4, \ - KB1, KB2, KB3, KB4, \ - KC1, KC2, KC3, \ - KD1, KD2, KD3, KD4, \ - KE1, KE3 \ -) \ -{ \ - { KA1, KA2, KA3, KA4 }, \ - { KB1, KB2, KB3, KB4 }, \ - { KC1, KC2, KC3, KC_NO }, \ - { KD1, KD2, KD3, KD4 }, \ - { KE1, KC_NO, KE3, KC_NO } \ -} diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json index b373df4850..856549eb96 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/info.json @@ -23,55 +23,55 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0, "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":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1, "h":2}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "h":2, "matrix": [1, 3]}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3, "h":2}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "h":2, "matrix": [3, 3]}, - {"x":0, "y":4,"w":2}, - {"x":2, "y":4} + {"x":0, "y":4,"w":2, "matrix": [4, 0]}, + {"x":2, "y":4, "matrix": [4, 2]} ] }, "LAYOUT_ortho_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0, "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":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, + {"x":3, "y":2, "matrix": [2, 3]}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "matrix": [3, 3]}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} + {"x":0, "y":4, "matrix": [4, 0]}, + {"x":1, "y":4, "matrix": [4, 1]}, + {"x":2, "y":4, "matrix": [4, 2]}, + {"x":3, "y":4, "matrix": [4, 3]} ] } } diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json index ff91ee9f24..268e56032d 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/info.json @@ -18,18 +18,18 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "F1", "x": 0, "y": 0 }, - { "label": "F2", "x": 1, "y": 0 }, - { "label": "F3", "x": 2, "y": 0 }, - { "label": "F4", "x": 3, "y": 0 }, - { "label": "F5", "x": 4, "y": 0 }, - { "label": "F6", "x": 5, "y": 0 }, - { "label": "F7", "x": 6, "y": 0 }, - { "label": "F8", "x": 7, "y": 0 }, - { "label": "F9", "x": 8, "y": 0 }, - { "label": "F10", "x": 9, "y": 0 }, - { "label": "F11", "x": 10, "y": 0 }, - { "label": "F12", "x": 11, "y": 0 } + { "x": 0, "y": 0, "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": 6, "y": 0, "matrix": [0, 6] }, + { "x": 7, "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] } ] } } diff --git a/keyboards/keebio/stick/stick.c b/keyboards/keebio/stick/stick.c index 8db839de3b..6fac145091 100644 --- a/keyboards/keebio/stick/stick.c +++ b/keyboards/keebio/stick/stick.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stick.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/stick/stick.h b/keyboards/keebio/stick/stick.h deleted file mode 100644 index 758d7d5b97..0000000000 --- a/keyboards/keebio/stick/stick.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 Danny Nguyen <danny@keeb.io> - -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" - -#define LAYOUT( \ - A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12 \ - ) { \ - {A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12} \ - } diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json index 2be3e55e70..3f34d8e604 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/info.json @@ -18,8 +18,8 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]} ] } } diff --git a/keyboards/keebio/tukey/tukey.c b/keyboards/keebio/tukey/tukey.c deleted file mode 100644 index a4582370e4..0000000000 --- a/keyboards/keebio/tukey/tukey.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Keebio - * - * 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/>. - */ -#include "tukey.h" diff --git a/keyboards/keebio/tukey/tukey.h b/keyboards/keebio/tukey/tukey.h deleted file mode 100644 index b8e40bb04d..0000000000 --- a/keyboards/keebio/tukey/tukey.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2019 Keebio - * - * 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" - -#define LAYOUT(k00, k01) { {k00, k01} } diff --git a/keyboards/keyhive/uno/info.json b/keyboards/keyhive/uno/info.json index 9d39163a1b..9c239fc5ea 100644 --- a/keyboards/keyhive/uno/info.json +++ b/keyboards/keyhive/uno/info.json @@ -8,7 +8,9 @@ }, "layouts": { "LAYOUT": { - "layout": [ {"x": 0, "y": 0 }] + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]} + ] } } } diff --git a/keyboards/keyhive/uno/rev1/rev1.h b/keyboards/keyhive/uno/rev1/rev1.h deleted file mode 100644 index 691bdd1dc3..0000000000 --- a/keyboards/keyhive/uno/rev1/rev1.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Snipeye - * - * 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" - -#define LAYOUT( \ - K00 \ -) { \ - { K00 } \ -} diff --git a/keyboards/keyhive/uno/rev2/rev2.h b/keyboards/keyhive/uno/rev2/rev2.h deleted file mode 100644 index 691bdd1dc3..0000000000 --- a/keyboards/keyhive/uno/rev2/rev2.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Snipeye - * - * 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" - -#define LAYOUT( \ - K00 \ -) { \ - { K00 } \ -} diff --git a/keyboards/keyhive/uno/uno.c b/keyboards/keyhive/uno/uno.c deleted file mode 100644 index 5ffb28865b..0000000000 --- a/keyboards/keyhive/uno/uno.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Snipeye - * - * 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/>. - */ - -#include "uno.h" diff --git a/keyboards/keyhive/uno/uno.h b/keyboards/keyhive/uno/uno.h deleted file mode 100644 index e25dc25f73..0000000000 --- a/keyboards/keyhive/uno/uno.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Snipeye - * - * 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" - -#if defined(KEYBOARD_keyhive_uno_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_keyhive_uno_rev2) -# include "rev2.h" -#endif diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json index b366c60315..0463c08ccc 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/info.json @@ -21,7 +21,13 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}] + "layout": [ + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]} + ] } } } diff --git a/keyboards/ktec/staryu/staryu.c b/keyboards/ktec/staryu/staryu.c deleted file mode 100755 index 4adadf2015..0000000000 --- a/keyboards/ktec/staryu/staryu.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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/>. -*/ -#include "staryu.h" diff --git a/keyboards/ktec/staryu/staryu.h b/keyboards/ktec/staryu/staryu.h deleted file mode 100755 index bdce5806f7..0000000000 --- a/keyboards/ktec/staryu/staryu.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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" -#define ___ KC_NO - -#define LAYOUT( \ - K01, K02, \ - K10, K11, K12 \ -) { \ - { ___, K01, K02 }, \ - { K10, K11, K12 } \ -} diff --git a/keyboards/leafcutterlabs/bigknob/bigknob.c b/keyboards/leafcutterlabs/bigknob/bigknob.c deleted file mode 100644 index 4fcb70e748..0000000000 --- a/keyboards/leafcutterlabs/bigknob/bigknob.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Craig Gardner - * - * 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/>. - */ - -#include "bigknob.h"
\ No newline at end of file diff --git a/keyboards/leafcutterlabs/bigknob/bigknob.h b/keyboards/leafcutterlabs/bigknob/bigknob.h deleted file mode 100644 index bb8e3fcaaf..0000000000 --- a/keyboards/leafcutterlabs/bigknob/bigknob.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Craig Gardner - * - * 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" - -#define LAYOUT_ortho_1x5( \ - k01, k02, k03, k04, k05\ - ) { \ - { k01, k02, k03, k04, k05 } \ -} - -#define LAYOUT LAYOUT_ortho_1x5
\ No newline at end of file diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json index ac8f8077d3..2a8830c308 100644 --- a/keyboards/leafcutterlabs/bigknob/info.json +++ b/keyboards/leafcutterlabs/bigknob/info.json @@ -15,9 +15,18 @@ ["B7", "D4", "D6", "F6", "F7"] ] }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_1x5" + }, "layouts": { "LAYOUT_ortho_1x5": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}] + "layout": [ + {"x":0, "y":0, "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]} + ] } } } diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json index ed6761b7a9..8837e60778 100644 --- a/keyboards/littlealby/mute/info.json +++ b/keyboards/littlealby/mute/info.json @@ -17,7 +17,9 @@ }, "layouts": { "LAYOUT": { - "layout": [ {"x": 0, "y": 0 }] + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]} + ] } } } diff --git a/keyboards/littlealby/mute/mute.c b/keyboards/littlealby/mute/mute.c deleted file mode 100644 index 4a207b8f38..0000000000 --- a/keyboards/littlealby/mute/mute.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 albybatber - * - * 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/>. - */ -#include "mute.h" diff --git a/keyboards/littlealby/mute/mute.h b/keyboards/littlealby/mute/mute.h deleted file mode 100644 index ea8acd815f..0000000000 --- a/keyboards/littlealby/mute/mute.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2019 albybarber - * - * 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" - -#define LAYOUT( \ - K00 \ -) { \ - { K00 } \ -} diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json index d8479b2a00..89720d9b70 100644 --- a/keyboards/macro3/info.json +++ b/keyboards/macro3/info.json @@ -22,15 +22,15 @@ "layouts": { "LAYOUT_ortho_2x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, + {"x": 0, "y": 0, "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": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]} ] } } diff --git a/keyboards/macro3/macro3.c b/keyboards/macro3/macro3.c index 0937abfc83..54fce243ab 100644 --- a/keyboards/macro3/macro3.c +++ b/keyboards/macro3/macro3.c @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include "macro3.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/macro3/macro3.h b/keyboards/macro3/macro3.h deleted file mode 100644 index 4a5071cbfe..0000000000 --- a/keyboards/macro3/macro3.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 David Philip Barr <@davidphilipbarr> - * Copyright 2021 @filterpaper - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include "quantum.h" - -#define LAYOUT_ortho_2x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 } \ -} - diff --git a/keyboards/makeymakey/info.json b/keyboards/makeymakey/info.json index c3114dd744..19e3f7e858 100644 --- a/keyboards/makeymakey/info.json +++ b/keyboards/makeymakey/info.json @@ -21,24 +21,24 @@ "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":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "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":0, "y":0, "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":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, + {"x":4, "y":1, "matrix": [1, 4]}, + {"x":5, "y":1, "matrix": [1, 5]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":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]} ] } } diff --git a/keyboards/makeymakey/makeymakey.c b/keyboards/makeymakey/makeymakey.c index ade9200de4..5b8edd4655 100644 --- a/keyboards/makeymakey/makeymakey.c +++ b/keyboards/makeymakey/makeymakey.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "makeymakey.h" +#include "quantum.h" static pin_t pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; static pin_t led_pins[LED_PINS] = LED_PINS_HW; diff --git a/keyboards/makeymakey/makeymakey.h b/keyboards/makeymakey/makeymakey.h deleted file mode 100644 index 9b8c273d86..0000000000 --- a/keyboards/makeymakey/makeymakey.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com> - * - * 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" - -// clang-format off - #define LAYOUT( \ - K00, K01, K02, K03, K04, K05, \ - K10, K11, K12, K13, K14, K15, \ - K20, K21, K22, K23, K24, K25 \ - ) \ - { \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 } \ - } -// clang-format on diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json index e8e1872f88..292f69085a 100644 --- a/keyboards/miniaxe/info.json +++ b/keyboards/miniaxe/info.json @@ -22,9 +22,56 @@ ] }, "community_layouts": ["split_3x5_3"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, "layouts": { "LAYOUT_split_3x5_3": { - "layout": [{"label":"Q", "x":0, "y":0}, {"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":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":0, "y":1}, {"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":"J", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"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":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Cmd", "x":2, "y":3}, {"label":"⇓", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"Opt", "x":8, "y":3}] + "layout": [ + {"x":0, "y":0, "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":6, "y":0, "matrix": [4, 0]}, + {"x":7, "y":0, "matrix": [4, 1]}, + {"x":8, "y":0, "matrix": [4, 2]}, + {"x":9, "y":0, "matrix": [4, 3]}, + {"x":10, "y":0, "matrix": [4, 4]}, + + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, + {"x":4, "y":1, "matrix": [1, 4]}, + + {"x":6, "y":1, "matrix": [5, 0]}, + {"x":7, "y":1, "matrix": [5, 1]}, + {"x":8, "y":1, "matrix": [5, 2]}, + {"x":9, "y":1, "matrix": [5, 3]}, + {"x":10, "y":1, "matrix": [5, 4]}, + + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":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":6, "y":2, "matrix": [6, 0]}, + {"x":7, "y":2, "matrix": [6, 1]}, + {"x":8, "y":2, "matrix": [6, 2]}, + {"x":9, "y":2, "matrix": [6, 3]}, + {"x":10, "y":2, "matrix": [6, 4]}, + + {"x":2, "y":3, "matrix": [3, 0]}, + {"x":3, "y":3, "matrix": [3, 1]}, + {"x":4, "y":3, "matrix": [3, 2]}, + + {"x":6, "y":3, "matrix": [7, 0]}, + {"x":7, "y":3, "matrix": [7, 1]}, + {"x":8, "y":3, "matrix": [7, 2]} + ] } } } diff --git a/keyboards/miniaxe/miniaxe.c b/keyboards/miniaxe/miniaxe.c deleted file mode 100644 index bda61784ed..0000000000 --- a/keyboards/miniaxe/miniaxe.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> - * - * 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/>. - */ -#include "miniaxe.h" diff --git a/keyboards/miniaxe/miniaxe.h b/keyboards/miniaxe/miniaxe.h deleted file mode 100644 index fc23865c36..0000000000 --- a/keyboards/miniaxe/miniaxe.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2018 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> - * - * 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 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. - */ - -// readability -#define ___ KC_NO - -#define LAYOUT_split_3x5_3( \ - L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ - L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ - L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ - L16, L17, L18, R16, R17, R18 \ -) { \ - { L01, L02, L03, L04, L05 }, \ - { L06, L07, L08, L09, L10 }, \ - { L11, L12, L13, L14, L15 }, \ - { L16, L17, L18, ___, ___ }, \ - { R01, R02, R03, R04, R05 }, \ - { R06, R07, R08, R09, R10 }, \ - { R11, R12, R13, R14, R15 }, \ - { R16, R17, R18, ___, ___ } \ -} - -#define LAYOUT LAYOUT_split_3x5_3 diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json index 1ecd8f7b8c..a4969498ed 100644 --- a/keyboards/minimacro5/info.json +++ b/keyboards/minimacro5/info.json @@ -17,7 +17,13 @@ }, "layouts": { "LAYOUT_ortho_1x5": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0}] + "layout": [ + {"x":0, "y":0, "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":5, "y":0, "matrix": [0, 4]} + ] } } } diff --git a/keyboards/minimacro5/minimacro5.c b/keyboards/minimacro5/minimacro5.c deleted file mode 100644 index 7f9c5af1c7..0000000000 --- a/keyboards/minimacro5/minimacro5.c +++ /dev/null @@ -1 +0,0 @@ -#include "minimacro5.h" diff --git a/keyboards/minimacro5/minimacro5.h b/keyboards/minimacro5/minimacro5.h deleted file mode 100644 index 2d61ed893b..0000000000 --- a/keyboards/minimacro5/minimacro5.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_1x5( \ - k01, k02, k03, k04, k05\ - ) { \ - { k01, k02, k03, k04, k05 } \ -} diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index cfc774bc2b..584a8f85b7 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/mixi/mixi.c b/keyboards/mixi/mixi.c index f99c942f2d..e8da7fdac2 100644 --- a/keyboards/mixi/mixi.c +++ b/keyboards/mixi/mixi.c @@ -1,4 +1,4 @@ -#include "mixi.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/mixi/mixi.h b/keyboards/mixi/mixi.h deleted file mode 100644 index 8b2bc7090b..0000000000 --- a/keyboards/mixi/mixi.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22 \ - ) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 } \ -} diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json index c9fa789b70..28f270038c 100755 --- a/keyboards/novelkeys/nk1/info.json +++ b/keyboards/novelkeys/nk1/info.json @@ -18,7 +18,9 @@ "community_layouts": ["ortho_1x1"], "layouts": { "LAYOUT_ortho_1x1": { - "layout": [{"x": 0, "y": 0}] + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0]} + ] } } } diff --git a/keyboards/novelkeys/nk1/nk1.c b/keyboards/novelkeys/nk1/nk1.c deleted file mode 100644 index 6833478568..0000000000 --- a/keyboards/novelkeys/nk1/nk1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Yiancar - * - * 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/>. - */ - -#include "nk1.h" diff --git a/keyboards/novelkeys/nk1/nk1.h b/keyboards/novelkeys/nk1/nk1.h deleted file mode 100644 index 3962e18516..0000000000 --- a/keyboards/novelkeys/nk1/nk1.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Yiancar - * - * 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" - -#define LAYOUT_ortho_1x1( \ - K00 \ -) { \ - { K00 } \ -} diff --git a/keyboards/nullbitsco/scramble/info.json b/keyboards/nullbitsco/scramble/info.json index 216d83e49e..32bb6f299e 100644 --- a/keyboards/nullbitsco/scramble/info.json +++ b/keyboards/nullbitsco/scramble/info.json @@ -12,31 +12,12 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "n", - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - } + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]} ] } } diff --git a/keyboards/nullbitsco/scramble/scramble.c b/keyboards/nullbitsco/scramble/scramble.c deleted file mode 100644 index c8a55e0d48..0000000000 --- a/keyboards/nullbitsco/scramble/scramble.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Jay Greco - -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/>. -*/ - -#include QMK_KEYBOARD_H diff --git a/keyboards/nullbitsco/scramble/scramble.h b/keyboards/nullbitsco/scramble/scramble.h deleted file mode 100644 index 22c112040b..0000000000 --- a/keyboards/nullbitsco/scramble/scramble.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Jay Greco - * - * 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" - -#if defined(KEYBOARD_nullbitsco_scramble_v1) - #include "v1.h" -#elif defined(KEYBOARD_nullbitsco_scramble_v2) - #include "v2.h" -#endif - -// Layout is the same in all revisions -#define LAYOUT( \ - K01, K02, K03, \ - K11, K12, K13 \ -) { \ - {K01, K02, K03}, \ - {K11, K12, K13}, \ -} diff --git a/keyboards/nullbitsco/scramble/v1/v1.h b/keyboards/nullbitsco/scramble/v1/v1.h index 5dc6d4a0e8..5c0b62357f 100644 --- a/keyboards/nullbitsco/scramble/v1/v1.h +++ b/keyboards/nullbitsco/scramble/v1/v1.h @@ -3,7 +3,7 @@ #pragma once -#include "scramble.h" +#include "quantum.h" // Indication LED settings #define LED_ON 2 diff --git a/keyboards/nullbitsco/scramble/v2/v2.h b/keyboards/nullbitsco/scramble/v2/v2.h index d278c0a86a..c86282f658 100644 --- a/keyboards/nullbitsco/scramble/v2/v2.h +++ b/keyboards/nullbitsco/scramble/v2/v2.h @@ -3,7 +3,7 @@ #pragma once -#include "scramble.h" +#include "quantum.h" #include <hal.h> enum led_mode { diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json index 9c06492dbe..e598ec3392 100644 --- a/keyboards/obosob/steal_this_keyboard/info.json +++ b/keyboards/obosob/steal_this_keyboard/info.json @@ -37,47 +37,47 @@ "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"x": 0, "y": 0.93, "matrix": [0, 0]}, + {"x": 1, "y": 0.31, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0.28, "matrix": [0, 3]}, + {"x": 4, "y": 0.42, "matrix": [0, 4]}, - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, + {"x": 7, "y": 0.42, "matrix": [4, 0]}, + {"x": 8, "y": 0.28, "matrix": [4, 1]}, + {"x": 9, "y": 0, "matrix": [4, 2]}, + {"x": 10, "y": 0.31, "matrix": [4, 3]}, + {"x": 11, "y": 0.93, "matrix": [4, 4]}, - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"x": 0, "y": 1.93, "matrix": [1, 0]}, + {"x": 1, "y": 1.31, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1.28, "matrix": [1, 3]}, + {"x": 4, "y": 1.42, "matrix": [1, 4]}, - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, + {"x": 7, "y": 1.42, "matrix": [5, 0]}, + {"x": 8, "y": 1.28, "matrix": [5, 1]}, + {"x": 9, "y": 1, "matrix": [5, 2]}, + {"x": 10, "y": 1.31, "matrix": [5, 3]}, + {"x": 11, "y": 1.93, "matrix": [5, 4]}, - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"x": 0, "y": 2.93, "matrix": [2, 0]}, + {"x": 1, "y": 2.31, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2.28, "matrix": [2, 3]}, + {"x": 4, "y": 2.42, "matrix": [2, 4]}, - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, + {"x": 7, "y": 2.42, "matrix": [6, 0]}, + {"x": 8, "y": 2.28, "matrix": [6, 1]}, + {"x": 9, "y": 2, "matrix": [6, 2]}, + {"x": 10, "y": 2.31, "matrix": [6, 3]}, + {"x": 11, "y": 2.93, "matrix": [6, 4]}, - {"x": 3.5, "y": 3.75}, - {"x": 4.5, "y": 4}, + {"x": 3.5, "y": 3.75, "matrix": [3, 0]}, + {"x": 4.5, "y": 4, "matrix": [3, 1]}, - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 3.75} + {"x": 6.5, "y": 4, "matrix": [7, 0]}, + {"x": 7.5, "y": 3.75, "matrix": [7, 1]} ] } } diff --git a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c deleted file mode 100644 index cd5ef5cdda..0000000000 --- a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Obosob <obosob@riseup.net> - * - * 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/>. - */ -#include "steal_this_keyboard.h" diff --git a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h deleted file mode 100644 index af7204f540..0000000000 --- a/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Obosob <obosob@riseup.net> - * - * 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/>. - */ - -#include "quantum.h" - -/* This 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. - */ - -// readability -#define ___ KC_NO - -#define LAYOUT_split_3x5_2( \ - L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ - L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ - L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ - L16, L17, R16, R17 \ - ) \ - { \ - { L01, L02, L03, L04, L05 }, \ - { L06, L07, L08, L09, L10 }, \ - { L11, L12, L13, L14, L15 }, \ - { L16, L17, ___, ___ , ___}, \ - { R01, R02, R03, R04, R05 }, \ - { R06, R07, R08, R09, R10 }, \ - { R11, R12, R13, R14, R15 }, \ - { R16, R17, ___, ___, ___ } \ - } diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index 16f1db0328..00afdbbdc7 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -17,7 +17,16 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + "layout": [ + {"x":0, "y":0, "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":0, "y":1, "matrix": [0, 4]}, + {"x":1, "y":1, "matrix": [0, 5]}, + {"x":2, "y":1, "matrix": [0, 6]}, + {"x":3, "y":1, "matrix": [0, 7]} + ] } } } diff --git a/keyboards/peranekofactory/tone/rev1/rev1.c b/keyboards/peranekofactory/tone/rev1/rev1.c deleted file mode 100644 index df99ef2e0b..0000000000 --- a/keyboards/peranekofactory/tone/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 peraneko - * - * 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/>. - */ - -#include "rev1.h" diff --git a/keyboards/peranekofactory/tone/rev1/rev1.h b/keyboards/peranekofactory/tone/rev1/rev1.h deleted file mode 100644 index 47f6423391..0000000000 --- a/keyboards/peranekofactory/tone/rev1/rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 peraneko - * - * 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, K06, K07 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ -} diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index 16f1db0328..00afdbbdc7 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -17,7 +17,16 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + "layout": [ + {"x":0, "y":0, "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":0, "y":1, "matrix": [0, 4]}, + {"x":1, "y":1, "matrix": [0, 5]}, + {"x":2, "y":1, "matrix": [0, 6]}, + {"x":3, "y":1, "matrix": [0, 7]} + ] } } } diff --git a/keyboards/peranekofactory/tone/rev2/rev2.c b/keyboards/peranekofactory/tone/rev2/rev2.c deleted file mode 100644 index aa95110979..0000000000 --- a/keyboards/peranekofactory/tone/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 peraneko - * - * 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/>. - */ - -#include "rev2.h" diff --git a/keyboards/peranekofactory/tone/rev2/rev2.h b/keyboards/peranekofactory/tone/rev2/rev2.h deleted file mode 100644 index 47f6423391..0000000000 --- a/keyboards/peranekofactory/tone/rev2/rev2.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 peraneko - * - * 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, K06, K07 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ -} diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json index 522f996ef8..c8889f59f9 100644 --- a/keyboards/ploopyco/mouse/info.json +++ b/keyboards/ploopyco/mouse/info.json @@ -21,14 +21,14 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0, "h":2}, - {"x":2, "y":0, "h":2}, - {"x":3, "y":0.25, "h":1.25}, - {"x":4, "y":0, "h":2}, - {"x":5, "y":0, "h":2}, - {"x":0, "y":0}, - {"x":0, "y":1}, - {"x":3, "y":1.5} + {"x":1, "y":0, "h":2, "matrix": [0, 6]}, + {"x":2, "y":0, "h":2, "matrix": [0, 0]}, + {"x":3, "y":0.25, "h":1.25, "matrix": [0, 1]}, + {"x":4, "y":0, "h":2, "matrix": [0, 2]}, + {"x":5, "y":0, "h":2, "matrix": [0, 5]}, + {"x":0, "y":0, "matrix": [0, 3]}, + {"x":0, "y":1, "matrix": [0, 4]}, + {"x":3, "y":1.5, "matrix": [0, 7]} ] } } diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h index 8383049aa5..508a883169 100644 --- a/keyboards/ploopyco/mouse/mouse.h +++ b/keyboards/ploopyco/mouse/mouse.h @@ -30,9 +30,6 @@ void process_wheel(void); -#define LAYOUT(BLL, BL, BM, BR, BRR, BF, BB, BDPI) \ - { {BL, BM, BR, BF, BB, BRR, BLL, BDPI}, } - typedef union { uint32_t raw; struct { diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json index 4d5fb44fac..a1f9c53284 100644 --- a/keyboards/ploopyco/trackball/info.json +++ b/keyboards/ploopyco/trackball/info.json @@ -14,11 +14,11 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "h":2}, - {"x":1, "y":0.25, "h":1.5}, - {"x":2, "y":0, "h":2}, - {"x":3.5, "y":0, "h":2}, - {"x":4.5, "y":0, "h":2} + {"x":0, "y":0, "h":2, "matrix": [0, 0]}, + {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]}, + {"x":2, "y":0, "h":2, "matrix": [0, 2]}, + {"x":3.5, "y":0, "h":2, "matrix": [0, 3]}, + {"x":4.5, "y":0, "h":2, "matrix": [0, 4]} ] } } diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h index 8452a78ee7..e2e46b2c97 100644 --- a/keyboards/ploopyco/trackball/trackball.h +++ b/keyboards/ploopyco/trackball/trackball.h @@ -33,9 +33,6 @@ #define OPT_ENC1_MUX 0 #define OPT_ENC2_MUX 4 -#define LAYOUT(BL, BM, BR, BF, BB) \ - { {BL, BM, BR, BF, BB}, } - typedef union { uint32_t raw; struct { diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json index 1c8ed6351a..e3daea0575 100644 --- a/keyboards/ploopyco/trackball_mini/info.json +++ b/keyboards/ploopyco/trackball_mini/info.json @@ -16,11 +16,11 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "h":2}, - {"x":1, "y":0.25, "h":1.5}, - {"x":2, "y":0, "h":2}, - {"x":3.5, "y":0, "h":2}, - {"x":4.5, "y":0, "h":2} + {"x":0, "y":0, "h":2, "matrix": [0, 0]}, + {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]}, + {"x":2, "y":0, "h":2, "matrix": [0, 2]}, + {"x":3.5, "y":0, "h":2, "matrix": [0, 3]}, + {"x":4.5, "y":0, "h":2, "matrix": [0, 4]} ] } } diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.h b/keyboards/ploopyco/trackball_mini/trackball_mini.h index 3af2a49b5e..3410751cb0 100644 --- a/keyboards/ploopyco/trackball_mini/trackball_mini.h +++ b/keyboards/ploopyco/trackball_mini/trackball_mini.h @@ -31,9 +31,6 @@ void process_wheel(void); -#define LAYOUT(BL, BM, BR, BF, BB) \ - { {BL, BM, BR, BF, BB}, } - typedef union { uint32_t raw; struct { diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json index 610efd27b3..522ff43d99 100644 --- a/keyboards/ploopyco/trackball_nano/info.json +++ b/keyboards/ploopyco/trackball_nano/info.json @@ -14,7 +14,7 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0} + {"x":0, "y":0, "matrix": [0, 0]} ] } } diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.h b/keyboards/ploopyco/trackball_nano/trackball_nano.h index d971627fc6..4cdbc7f11f 100644 --- a/keyboards/ploopyco/trackball_nano/trackball_nano.h +++ b/keyboards/ploopyco/trackball_nano/trackball_nano.h @@ -21,8 +21,6 @@ #include "quantum.h" -#define LAYOUT(k00) {{ k00 }} - typedef union { uint32_t raw; struct { diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json index d3e5b413a1..495a525a43 100644 --- a/keyboards/sendyyeah/pix/info.json +++ b/keyboards/sendyyeah/pix/info.json @@ -18,11 +18,11 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0} + {"x":0, "y":0, "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]} ] } } diff --git a/keyboards/sendyyeah/pix/pix.c b/keyboards/sendyyeah/pix/pix.c index 07ef088cd1..1bd8627e16 100644 --- a/keyboards/sendyyeah/pix/pix.c +++ b/keyboards/sendyyeah/pix/pix.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pix.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/sendyyeah/pix/pix.h b/keyboards/sendyyeah/pix/pix.h deleted file mode 100644 index a46792855f..0000000000 --- a/keyboards/sendyyeah/pix/pix.h +++ /dev/null @@ -1,23 +0,0 @@ - /* Copyright 2020 sendyyeah - * - * 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" - -#define LAYOUT(K00, K01, K02, K03, K04) { \ - { K00, K01, K02, K03, K04 }, \ -} diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.h b/keyboards/sergiopoverony/creator_pro/creator_pro.h index 566e94a77a..b5c7c37870 100644 --- a/keyboards/sergiopoverony/creator_pro/creator_pro.h +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.h @@ -17,16 +17,6 @@ #pragma once #include "quantum.h" -#define LAYOUT( \ -K01, K02, K03, K04, \ - K05, \ -K06, K07, K08, K09 \ -) { { \ -K01, K02, K03, K04, \ - K05, \ -K06, K07, K08, K09 \ -} } - /*led work*/ void turn_off_leds(void); void turn_on_led(pin_t pin); diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json index 5b7a061e24..46889dbd1e 100644 --- a/keyboards/sergiopoverony/creator_pro/info.json +++ b/keyboards/sergiopoverony/creator_pro/info.json @@ -18,15 +18,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4.5, "y":0.5}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1} + {"x":0, "y":0, "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.5, "y":0.5, "matrix": [0, 4]}, + {"x":0, "y":1, "matrix": [0, 5]}, + {"x":1, "y":1, "matrix": [0, 6]}, + {"x":2, "y":1, "matrix": [0, 7]}, + {"x":3, "y":1, "matrix": [0, 8]} ] } } diff --git a/keyboards/spaceman/2_milk/2_milk.c b/keyboards/spaceman/2_milk/2_milk.c deleted file mode 100644 index 96071c2ad5..0000000000 --- a/keyboards/spaceman/2_milk/2_milk.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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/>. - */ -#include "2_milk.h" diff --git a/keyboards/spaceman/2_milk/2_milk.h b/keyboards/spaceman/2_milk/2_milk.h deleted file mode 100644 index 7d90d2064f..0000000000 --- a/keyboards/spaceman/2_milk/2_milk.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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" - -#define LAYOUT( \ - K00, \ - K01 \ -) { \ - { K00 }, \ - { K01 } \ -} diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json index c1f31a3ba7..daba0b9851 100644 --- a/keyboards/spaceman/2_milk/info.json +++ b/keyboards/spaceman/2_milk/info.json @@ -18,7 +18,10 @@ }, "layouts": { "LAYOUT": { - "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0] }, + {"x": 0, "y": 1, "matrix": [1, 0] } + ] } } } diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index a38404cc97..ab1b8ae020 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -21,18 +21,18 @@ "layouts": { "LAYOUT_ortho_4x3": { "layout": [ - {"label":"K00 (B0,B4)", "x":0, "y":1}, - {"label":"K01 (B0,B5)", "x":1, "y":1}, - {"label":"K02 (B0,B6)", "x":2, "y":1}, - {"label":"K10 (B1,B4)", "x":0, "y":2}, - {"label":"K11 (B1,B5)", "x":1, "y":2}, - {"label":"K12 (B1,B6)", "x":2, "y":2}, - {"label":"K20 (B2,B4)", "x":0, "y":3}, - {"label":"K21 (B2,B5)", "x":1, "y":3}, - {"label":"K22 (B2,B6)", "x":2, "y":3}, - {"label":"K30 (B3,B4)", "x":0, "y":4}, - {"label":"K31 (B3,B5)", "x":1, "y":4}, - {"label":"K32 (B3,B6)", "x":2, "y":4} + {"x":0, "y":1, "matrix": [0, 0]}, + {"x":1, "y":1, "matrix": [0, 1]}, + {"x":2, "y":1, "matrix": [0, 2]}, + {"x":0, "y":2, "matrix": [1, 0]}, + {"x":1, "y":2, "matrix": [1, 1]}, + {"x":2, "y":2, "matrix": [1, 2]}, + {"x":0, "y":3, "matrix": [2, 0]}, + {"x":1, "y":3, "matrix": [2, 1]}, + {"x":2, "y":3, "matrix": [2, 2]}, + {"x":0, "y":4, "matrix": [3, 0]}, + {"x":1, "y":4, "matrix": [3, 1]}, + {"x":2, "y":4, "matrix": [3, 2]} ] } } diff --git a/keyboards/splitkb/zima/zima.c b/keyboards/splitkb/zima/zima.c index f39e3a39eb..2ac1f78d34 100644 --- a/keyboards/splitkb/zima/zima.c +++ b/keyboards/splitkb/zima/zima.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "zima.h" +#include "quantum.h" #include <stdio.h> #ifdef HAPTIC_ENABLE diff --git a/keyboards/splitkb/zima/zima.h b/keyboards/splitkb/zima/zima.h deleted file mode 100644 index dc492ef107..0000000000 --- a/keyboards/splitkb/zima/zima.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2019 Thomas Baart - * - * 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" - -#define LAYOUT_ortho_4x3( \ - k00, k01, k02, \ - k03, k04, k05, \ - k06, k07, k08, \ - k09, k10, k11 \ - ) { \ - {k00, k01, k02}, \ - {k03, k04, k05}, \ - {k06, k07, k08}, \ - {k09, k10, k11} } diff --git a/keyboards/synthlabs/solo/solo.c b/keyboards/synthlabs/solo/solo.c index b557a3505c..aca82c9ea3 100644 --- a/keyboards/synthlabs/solo/solo.c +++ b/keyboards/synthlabs/solo/solo.c @@ -1,7 +1,7 @@ // Copyright 2022 Aaron Hong (@hongaaronc) // SPDX-License-Identifier: GPL-2.0-or-later -#include "solo.h" +#include "quantum.h" #if !defined(VIA_ENABLE) && !defined(JOYSTICK_ENABLE) && defined(ENCODER_ENABLE) bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/synthlabs/solo/solo.h b/keyboards/synthlabs/solo/solo.h deleted file mode 100644 index c487446a49..0000000000 --- a/keyboards/synthlabs/solo/solo.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2022 Aaron Hong (@hongaaronc) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, \ - k10, k11, k12, \ - k20, k21, k22, k23, k24, k25, k26 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, XXX, XXX, XXX, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26 } \ -} - -#define LAYOUT_left( \ - k01, k03, k05, \ - k10, k11, k12, \ - k20, k22, k24, k26 \ -) { \ - { XXX, k01, XXX, k03, XXX, k05, XXX }, \ - { k10, k11, k12, XXX, XXX, XXX, XXX }, \ - { k20, XXX, k22, XXX, k24, XXX, k26 } \ -} - -#define LAYOUT_right( \ - k25, k23, k21, \ - k10, k11, k12, \ - k06, k04, k02, k00 \ -) { \ - { k00, XXX, k02, XXX, k04, XXX, k06 }, \ - { k10, k11, k12, XXX, XXX, XXX, XXX }, \ - { XXX, k21, XXX, k23, XXX, k25, XXX } \ -} diff --git a/keyboards/tominabox1/bigboy/bigboy.c b/keyboards/tominabox1/bigboy/bigboy.c index 3cb1ec442d..6871d81a62 100755 --- a/keyboards/tominabox1/bigboy/bigboy.c +++ b/keyboards/tominabox1/bigboy/bigboy.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "bigboy.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/tominabox1/bigboy/bigboy.h b/keyboards/tominabox1/bigboy/bigboy.h deleted file mode 100755 index ef3b4a44f9..0000000000 --- a/keyboards/tominabox1/bigboy/bigboy.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 tominabox1 - * - * 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" - - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12 \ -) { \ - { K00, K01, K02, }, \ - { K10, K11, K12 }, \ -} - -#define LAYOUT_2us( \ - K00, K01, K02 \ -) { \ - { K00, K01, K02 }, \ -} diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json index 79cf08b39b..cdddc688d1 100644 --- a/keyboards/tominabox1/bigboy/info.json +++ b/keyboards/tominabox1/bigboy/info.json @@ -18,10 +18,21 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]} + ] }, "LAYOUT_2us": { - "layout": [{"label":"0,0", "x":0, "y":0, "h":2}, {"label":"0,1", "x":1, "y":0, "h":2}, {"label":"0,2", "x":2, "y":0, "h":2}] + "layout": [ + {"x":0, "y":0, "h":2, "matrix": [0, 0]}, + {"x":1, "y":0, "h":2, "matrix": [0, 1]}, + {"x":2, "y":0, "h":2, "matrix": [0, 2]} + ] } } } diff --git a/keyboards/ungodly/nines/info.json b/keyboards/ungodly/nines/info.json index 1e7dabe367..34b10245a8 100644 --- a/keyboards/ungodly/nines/info.json +++ b/keyboards/ungodly/nines/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT_ortho_3x3": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/ungodly/nines/nines.c b/keyboards/ungodly/nines/nines.c index 08f8a9ad74..bfb3bb889d 100644 --- a/keyboards/ungodly/nines/nines.c +++ b/keyboards/ungodly/nines/nines.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "nines.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/ungodly/nines/nines.h b/keyboards/ungodly/nines/nines.h deleted file mode 100644 index f67615ecf9..0000000000 --- a/keyboards/ungodly/nines/nines.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 Ungodly Design <hello@ungodly.design> - * - * 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 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_ortho_3x3( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json index b3cba1658c..56a13deaf9 100644 --- a/keyboards/winkeys/mini_winni/info.json +++ b/keyboards/winkeys/mini_winni/info.json @@ -17,7 +17,16 @@ }, "layouts": { "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + "layout": [ + {"x":0, "y":0, "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":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]} + ] } } } diff --git a/keyboards/winkeys/mini_winni/mini_winni.c b/keyboards/winkeys/mini_winni/mini_winni.c deleted file mode 100644 index 35c75c4ad7..0000000000 --- a/keyboards/winkeys/mini_winni/mini_winni.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Matthew Dias - -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/>. -*/ - -#include "mini_winni.h" diff --git a/keyboards/winkeys/mini_winni/mini_winni.h b/keyboards/winkeys/mini_winni/mini_winni.h deleted file mode 100644 index 4d4374761d..0000000000 --- a/keyboards/winkeys/mini_winni/mini_winni.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Matthew Dias - -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" -#define LAYOUT_all( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 } \ -} diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json index 5abc92a455..1b550c3122 100644 --- a/keyboards/winry/winry315/info.json +++ b/keyboards/winry/winry315/info.json @@ -21,90 +21,90 @@ "layouts": { "LAYOUT_top": { "layout": [ - { "label": "E0", "x": 0.5, "y": 0.25 }, - { "label": "E1", "x": 1.75, "y": 0, "h": 1.5, "w": 1.5 }, - { "label": "E2", "x": 3.5, "y": 0.25 }, - { "label": "0", "x": 0, "y": 1.75 }, - { "label": "1", "x": 1, "y": 1.75 }, - { "label": "2", "x": 2, "y": 1.75 }, - { "label": "3", "x": 3, "y": 1.75 }, - { "label": "4", "x": 4, "y": 1.75 }, - { "label": "5", "x": 0, "y": 2.75 }, - { "label": "6", "x": 1, "y": 2.75 }, - { "label": "7", "x": 2, "y": 2.75 }, - { "label": "8", "x": 3, "y": 2.75 }, - { "label": "9", "x": 4, "y": 2.75 }, - { "label": "10", "x": 0, "y": 3.75 }, - { "label": "11", "x": 1, "y": 3.75 }, - { "label": "12", "x": 2, "y": 3.75 }, - { "label": "13", "x": 3, "y": 3.75 }, - { "label": "14", "x": 4, "y": 3.75 } + { "x": 0.5, "y": 0.25, "matrix": [0, 17] }, + { "x": 1.75, "y": 0, "h": 1.5, "w": 1.5, "matrix": [0, 15] }, + { "x": 3.5, "y": 0.25, "matrix": [0, 16] }, + { "x": 0, "y": 1.75, "matrix": [0, 0] }, + { "x": 1, "y": 1.75, "matrix": [0, 1] }, + { "x": 2, "y": 1.75, "matrix": [0, 2] }, + { "x": 3, "y": 1.75, "matrix": [0, 3] }, + { "x": 4, "y": 1.75, "matrix": [0, 4] }, + { "x": 0, "y": 2.75, "matrix": [0, 5] }, + { "x": 1, "y": 2.75, "matrix": [0, 6] }, + { "x": 2, "y": 2.75, "matrix": [0, 7] }, + { "x": 3, "y": 2.75, "matrix": [0, 8] }, + { "x": 4, "y": 2.75, "matrix": [0, 9] }, + { "x": 0, "y": 3.75, "matrix": [0, 10] }, + { "x": 1, "y": 3.75, "matrix": [0, 11] }, + { "x": 2, "y": 3.75, "matrix": [0, 12] }, + { "x": 3, "y": 3.75, "matrix": [0, 13] }, + { "x": 4, "y": 3.75, "matrix": [0, 14] } ] }, "LAYOUT_left": { "layout": [ - { "label": "E2", "x": 0.25, "y": 0.5 }, - { "label": "4", "x": 1.75, "y": 0 }, - { "label": "9", "x": 2.75, "y": 0 }, - { "label": "14", "x": 3.75, "y": 0 }, - { "label": "3", "x": 1.75, "y": 1 }, - { "label": "8", "x": 2.75, "y": 1 }, - { "label": "13", "x": 3.75, "y": 1 }, - { "label": "E1", "x": 0, "y": 1.75, "h": 1.5, "w": 1.5 }, - { "label": "2", "x": 1.75, "y": 2 }, - { "label": "7", "x": 2.75, "y": 2 }, - { "label": "12", "x": 3.75, "y": 2 }, - { "label": "1", "x": 1.75, "y": 3 }, - { "label": "6", "x": 2.75, "y": 3 }, - { "label": "11", "x": 3.75, "y": 3 }, - { "label": "E0", "x": 0.25, "y": 3.5 }, - { "label": "0", "x": 1.75, "y": 4 }, - { "label": "5", "x": 2.75, "y": 4 }, - { "label": "10", "x": 3.75, "y": 4 } + { "x": 0.25, "y": 0.5, "matrix": [0, 16] }, + { "x": 1.75, "y": 0, "matrix": [0, 4] }, + { "x": 2.75, "y": 0, "matrix": [0, 9] }, + { "x": 3.75, "y": 0, "matrix": [0, 14] }, + { "x": 1.75, "y": 1, "matrix": [0, 3] }, + { "x": 2.75, "y": 1, "matrix": [0, 8] }, + { "x": 3.75, "y": 1, "matrix": [0, 13] }, + { "x": 0, "y": 1.75, "h": 1.5, "w": 1.5, "matrix": [0, 15] }, + { "x": 1.75, "y": 2, "matrix": [0, 2] }, + { "x": 2.75, "y": 2, "matrix": [0, 7] }, + { "x": 3.75, "y": 2, "matrix": [0, 12] }, + { "x": 1.75, "y": 3, "matrix": [0, 1] }, + { "x": 2.75, "y": 3, "matrix": [0, 6] }, + { "x": 3.75, "y": 3, "matrix": [0, 11] }, + { "x": 0.25, "y": 3.5, "matrix": [0, 17] }, + { "x": 1.75, "y": 4, "matrix": [0, 0] }, + { "x": 2.75, "y": 4, "matrix": [0, 5] }, + { "x": 3.75, "y": 4, "matrix": [0, 10] } ] }, "LAYOUT_right": { "layout": [ - { "label": "10", "x": 0, "y": 0 }, - { "label": "5", "x": 1, "y": 0 }, - { "label": "0", "x": 2, "y": 0 }, - { "label": "E0", "x": 3.5, "y": 0.5 }, - { "label": "11", "x": 0, "y": 1 }, - { "label": "6", "x": 1, "y": 1 }, - { "label": "1", "x": 2, "y": 1 }, - { "label": "12", "x": 0, "y": 2 }, - { "label": "7", "x": 1, "y": 2 }, - { "label": "2", "x": 2, "y": 2 }, - { "label": "E1", "x": 3.25, "y": 1.75, "h": 1.5, "w": 1.5 }, - { "label": "13", "x": 0, "y": 3 }, - { "label": "8", "x": 1, "y": 3 }, - { "label": "3", "x": 2, "y": 3 }, - { "label": "14", "x": 0, "y": 4 }, - { "label": "9", "x": 1, "y": 4 }, - { "label": "4", "x": 2, "y": 4 }, - { "label": "E2", "x": 3.5, "y": 3.5 } + { "x": 0, "y": 0, "matrix": [0, 10] }, + { "x": 1, "y": 0, "matrix": [0, 5] }, + { "x": 2, "y": 0, "matrix": [0, 0] }, + { "x": 3.5, "y": 0.5, "matrix": [0, 17] }, + { "x": 0, "y": 1, "matrix": [0, 11] }, + { "x": 1, "y": 1, "matrix": [0, 6] }, + { "x": 2, "y": 1, "matrix": [0, 1] }, + { "x": 0, "y": 2, "matrix": [0, 12] }, + { "x": 1, "y": 2, "matrix": [0, 7] }, + { "x": 2, "y": 2, "matrix": [0, 2] }, + { "x": 3.25, "y": 1.75, "h": 1.5, "w": 1.5, "matrix": [0, 15] }, + { "x": 0, "y": 3, "matrix": [0, 13] }, + { "x": 1, "y": 3, "matrix": [0, 8] }, + { "x": 2, "y": 3, "matrix": [0, 3] }, + { "x": 0, "y": 4, "matrix": [0, 14] }, + { "x": 1, "y": 4, "matrix": [0, 9] }, + { "x": 2, "y": 4, "matrix": [0, 4] }, + { "x": 3.5, "y": 3.5, "matrix": [0, 16] } ] }, "LAYOUT_bottom": { "layout": [ - { "label": "14", "x": 0, "y": 0 }, - { "label": "13", "x": 1, "y": 0 }, - { "label": "12", "x": 2, "y": 0 }, - { "label": "11", "x": 3, "y": 0 }, - { "label": "10", "x": 4, "y": 0 }, - { "label": "9", "x": 0, "y": 1 }, - { "label": "8", "x": 1, "y": 1 }, - { "label": "7", "x": 2, "y": 1 }, - { "label": "6", "x": 3, "y": 1 }, - { "label": "5", "x": 4, "y": 1 }, - { "label": "4", "x": 0, "y": 2 }, - { "label": "3", "x": 1, "y": 2 }, - { "label": "2", "x": 2, "y": 2 }, - { "label": "1", "x": 3, "y": 2 }, - { "label": "0", "x": 4, "y": 2 }, - { "label": "E2", "x": 0.5, "y": 3.5 }, - { "label": "E1", "x": 1.75, "y": 3.25, "h": 1.5, "w": 1.5 }, - { "label": "E0", "x": 3.5, "y": 3.5 } + { "x": 0, "y": 0, "matrix": [0, 14] }, + { "x": 1, "y": 0, "matrix": [0, 13] }, + { "x": 2, "y": 0, "matrix": [0, 12] }, + { "x": 3, "y": 0, "matrix": [0, 11] }, + { "x": 4, "y": 0, "matrix": [0, 10] }, + { "x": 0, "y": 1, "matrix": [0, 9] }, + { "x": 1, "y": 1, "matrix": [0, 8] }, + { "x": 2, "y": 1, "matrix": [0, 7] }, + { "x": 3, "y": 1, "matrix": [0, 6] }, + { "x": 4, "y": 1, "matrix": [0, 5] }, + { "x": 0, "y": 2, "matrix": [0, 4] }, + { "x": 1, "y": 2, "matrix": [0, 3] }, + { "x": 2, "y": 2, "matrix": [0, 2] }, + { "x": 3, "y": 2, "matrix": [0, 1] }, + { "x": 4, "y": 2, "matrix": [0, 0] }, + { "x": 0.5, "y": 3.5, "matrix": [0, 16] }, + { "x": 1.75, "y": 3.25, "h": 1.5, "w": 1.5, "matrix": [0, 15] }, + { "x": 3.5, "y": 3.5, "matrix": [0, 17] } ] } } diff --git a/keyboards/winry/winry315/winry315.h b/keyboards/winry/winry315/winry315.h index 4796089003..8129c9d6e0 100644 --- a/keyboards/winry/winry315/winry315.h +++ b/keyboards/winry/winry315/winry315.h @@ -24,63 +24,3 @@ enum winry315_orientation { // WINRY315_ORIENTATION_LEFT`) instead of adding custom code that calls this // function. void winry315_set_orientation(uint8_t orientation); - -// clang-format off - -// 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. -// -// For this board multiple layouts are defined to make it easier to use the -// board in a sideways orientation; the actual PCB supports only a single -// layout (LAYOUT_top). - -// Default layout: encoders at the top side (WINRY315_ORIENTATION_TOP). -#define LAYOUT_top( \ - k17, k15, k16, \ - k00, k01, k02, k03, k04, \ - k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -// Encoders at the left side (WINRY315_ORIENTATION_LEFT). -#define LAYOUT_left( \ - k16, k04, k09, k14, \ - k03, k08, k13, \ - k15, k02, k07, k12, \ - k01, k06, k11, \ - k17, k00, k05, k10 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -// Encoders at the right side (WINRY315_ORIENTATION_RIGHT). -#define LAYOUT_right( \ - k10, k05, k00, k17, \ - k11, k06, k01, \ - k12, k07, k02, k15, \ - k13, k08, k03, \ - k14, k09, k04, k16 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -// Encoders at the bottom side (WINRY315_ORIENTATION_BOTTOM). -#define LAYOUT_bottom( \ - k14, k13, k12, k11, k10, \ - k09, k08, k07, k06, k05, \ - k04, k03, k02, k01, k00, \ - k16, k15, k17 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -#define LAYOUT_all LAYOUT_top - -// clang-format on diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json index 4284b0548b..c160af5f85 100644 --- a/keyboards/xiudi/xd002/info.json +++ b/keyboards/xiudi/xd002/info.json @@ -16,8 +16,8 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]} ] } } diff --git a/keyboards/xiudi/xd002/xd002.c b/keyboards/xiudi/xd002/xd002.c deleted file mode 100644 index e679b97243..0000000000 --- a/keyboards/xiudi/xd002/xd002.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 zvecr<git@zvecr.com> - * - * 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/>. - */ -#include "xd002.h" diff --git a/keyboards/xiudi/xd002/xd002.h b/keyboards/xiudi/xd002/xd002.h deleted file mode 100644 index 3d780191bb..0000000000 --- a/keyboards/xiudi/xd002/xd002.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 zvecr<git@zvecr.com> - * - * 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 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 \ -) \ -{ \ - { K01, K02 }, \ -} diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 77f57ce322..175b7873f3 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -16,7 +16,12 @@ }, "layouts": { "LAYOUT_all": { - "layout": [{"label":"L", "x":0, "y":0}, {"label":"O", "x":1, "y":0}, {"label":"V", "x":2, "y":0}, {"label":"E", "x":3, "y":0}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]} + ] } } } diff --git a/keyboards/xiudi/xd004/xd004.c b/keyboards/xiudi/xd004/xd004.c deleted file mode 100644 index 7f0b4e52c5..0000000000 --- a/keyboards/xiudi/xd004/xd004.c +++ /dev/null @@ -1 +0,0 @@ -#include "xd004.h" diff --git a/keyboards/xiudi/xd004/xd004.h b/keyboards/xiudi/xd004/xd004.h deleted file mode 100644 index a53ad537f7..0000000000 --- a/keyboards/xiudi/xd004/xd004.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" -//#include "led.h" - -/* XD60 Keymap Definition Macro */ -/* - +--------------------------------+ - | K0 K1 K2 K3 [----- USB - +--------------------------------+ -*/ -#define LAYOUT_all(K00, K01, K02, K03) \ - { \ - { K00, K01, K02, K03 } \ - } diff --git a/keyboards/yatara/drink_me/drink_me.c b/keyboards/yatara/drink_me/drink_me.c deleted file mode 100644 index d5cac311ae..0000000000 --- a/keyboards/yatara/drink_me/drink_me.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Yatara - * - * 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/>. - */ - -#include "drink_me.h" diff --git a/keyboards/yatara/drink_me/drink_me.h b/keyboards/yatara/drink_me/drink_me.h deleted file mode 100644 index 9ed6dbf2ea..0000000000 --- a/keyboards/yatara/drink_me/drink_me.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Yatara - * - * 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" - -#define LAYOUT( \ - K00, K01, K02, K03 \ -) { \ - { K00, K01, K02, K03 } \ -} diff --git a/keyboards/yatara/drink_me/info.json b/keyboards/yatara/drink_me/info.json index 3df62cf378..78838f143a 100644 --- a/keyboards/yatara/drink_me/info.json +++ b/keyboards/yatara/drink_me/info.json @@ -18,26 +18,10 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "K0", - "x": 0, - "y": 0 - }, - { - "label": "K1", - "x": 1, - "y": 0 - }, - { - "label": "K2", - "x": 2, - "y": 0 - }, - { - "label": "K3", - "x": 3, - "y": 0 - } + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]} ] } } diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json index 98a98cac91..c82f1fd5ff 100644 --- a/keyboards/yeehaw/info.json +++ b/keyboards/yeehaw/info.json @@ -17,7 +17,22 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"VOLU", "x":1, "y":0}, {"label":"VOLD", "x":1, "y":1}, {"label":"M1", "x":2, "y":1.5}, {"label":"UP", "x":3, "y":1.5}, {"label":"MNXT", "x":1, "y":2}, {"label":"M2", "x":4, "y":2}, {"label":"LEFT", "x":2, "y":2.5}, {"label":"DOWN", "x":3, "y":2.5}, {"label":"MO(1)", "x":0, "y":2.75}, {"label":"MPRV", "x":1, "y":3}, {"label":"RIGHT", "x":4, "y":3}, {"label":"MPLY", "x":2, "y":3.5}, {"label":"CTL S", "x":3, "y":3.5}, {"label":"RGB TOG", "x":2.5, "y":4.5}] + "layout": [ + {"x":1, "y":0, "matrix": [0, 0]}, + {"x":1, "y":1, "matrix": [0, 1]}, + {"x":2, "y":1.5, "matrix": [0, 2]}, + {"x":3, "y":1.5, "matrix": [0, 3]}, + {"x":1, "y":2, "matrix": [0, 4]}, + {"x":4, "y":2, "matrix": [0, 5]}, + {"x":2, "y":2.5, "matrix": [0, 6]}, + {"x":3, "y":2.5, "matrix": [0, 7]}, + {"x":0, "y":2.75, "matrix": [0, 8]}, + {"x":1, "y":3, "matrix": [0, 9]}, + {"x":4, "y":3, "matrix": [0, 10]}, + {"x":2, "y":3.5, "matrix": [0, 11]}, + {"x":3, "y":3.5, "matrix": [0, 12]}, + {"x":2.5, "y":4.5, "matrix": [0, 13]} + ] } } } diff --git a/keyboards/yeehaw/yeehaw.c b/keyboards/yeehaw/yeehaw.c deleted file mode 100644 index 3c8a29cade..0000000000 --- a/keyboards/yeehaw/yeehaw.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Caleb Lightfoot - * - * 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/>. - */ -#include "yeehaw.h" diff --git a/keyboards/yeehaw/yeehaw.h b/keyboards/yeehaw/yeehaw.h deleted file mode 100644 index 0d63efab97..0000000000 --- a/keyboards/yeehaw/yeehaw.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Caleb Lightfoot - * - * 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" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 } \ - } - diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json index 6d6d4d6725..dfcd0e4f42 100644 --- a/keyboards/yushakobo/quick7/info.json +++ b/keyboards/yushakobo/quick7/info.json @@ -20,9 +20,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/yushakobo/quick7/quick7.c b/keyboards/yushakobo/quick7/quick7.c deleted file mode 100644 index 632bcf1ae5..0000000000 --- a/keyboards/yushakobo/quick7/quick7.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yushakobo - * - * 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/>. - */ - -#include "quick7.h" diff --git a/keyboards/yushakobo/quick7/quick7.h b/keyboards/yushakobo/quick7/quick7.h deleted file mode 100644 index 2e86487c7f..0000000000 --- a/keyboards/yushakobo/quick7/quick7.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 yushakobo - * - * 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, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/yynmt/acperience12/acperience12.c b/keyboards/yynmt/acperience12/acperience12.c deleted file mode 100644 index 783f87b094..0000000000 --- a/keyboards/yynmt/acperience12/acperience12.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yynmt - * - * 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/>. - */ - -#include "acperience12.h" diff --git a/keyboards/yynmt/acperience12/acperience12.h b/keyboards/yynmt/acperience12/acperience12.h deleted file mode 100644 index 62102249e1..0000000000 --- a/keyboards/yynmt/acperience12/acperience12.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 yynmt - * - * 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 - -#ifdef KEYBOARD_yynmt_acperience12_rev1 -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/yynmt/acperience12/rev1/info.json b/keyboards/yynmt/acperience12/rev1/info.json index 20d4f249c2..92f5c96212 100644 --- a/keyboards/yynmt/acperience12/rev1/info.json +++ b/keyboards/yynmt/acperience12/rev1/info.json @@ -23,12 +23,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, - {"x":0, "y":5}, {"x":1, "y":5} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":0, "y":4, "matrix": [4, 0]}, + {"x":1, "y":4, "matrix": [4, 1]}, + {"x":0, "y":5, "matrix": [5, 0]}, + {"x":1, "y":5, "matrix": [5, 1]} ] } } diff --git a/keyboards/yynmt/acperience12/rev1/rev1.c b/keyboards/yynmt/acperience12/rev1/rev1.c deleted file mode 100644 index f58e4a2b18..0000000000 --- a/keyboards/yynmt/acperience12/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yynmt - * - * 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/>. - */ - -#include "rev1.h" diff --git a/keyboards/yynmt/acperience12/rev1/rev1.h b/keyboards/yynmt/acperience12/rev1/rev1.h deleted file mode 100644 index 78c6c0c8ca..0000000000 --- a/keyboards/yynmt/acperience12/rev1/rev1.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 yynmt - * - * 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 "acperience12.h" - - -#define LAYOUT( \ - K00, K01, \ - K02, K03, \ - K04, K05, \ - K06, K07, \ - K08, K09, \ - K10, K11 \ -) \ -{ \ - { K00, K01 }, \ - { K02, K03 }, \ - { K04, K05 }, \ - { K06, K07 }, \ - { K08, K09 }, \ - { K10, K11 }, \ -} diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json index baed03f0fe..4f899bf7d6 100644 --- a/keyboards/z12/info.json +++ b/keyboards/z12/info.json @@ -21,21 +21,21 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, - {"x": 0, "y": 0.5}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 0.5}, + {"x": 0, "y": 0.5, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 0.5, "matrix": [1, 3]}, - {"x": 0.5, "y": 2}, - {"x": 1.5, "y": 2}, - {"x": 2.5, "y": 2}, + {"x": 0.5, "y": 2, "matrix": [2, 0]}, + {"x": 1.5, "y": 2, "matrix": [2, 1]}, + {"x": 2.5, "y": 2, "matrix": [2, 2]}, - {"x": 0.5, "y": 3}, - {"x": 1.5, "y": 3}, - {"x": 2.5, "y": 3} + {"x": 0.5, "y": 3, "matrix": [3, 0]}, + {"x": 1.5, "y": 3, "matrix": [3, 1]}, + {"x": 2.5, "y": 3, "matrix": [3, 2]} ] } } diff --git a/keyboards/z12/z12.c b/keyboards/z12/z12.c index 2af8836cab..3edc9128e4 100644 --- a/keyboards/z12/z12.c +++ b/keyboards/z12/z12.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "z12.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/z12/z12.h b/keyboards/z12/z12.h deleted file mode 100644 index 0ea6c303f7..0000000000 --- a/keyboards/z12/z12.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com> - * - * 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/>. - */ - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout */ - -#define ___ KC_NO - -#define LAYOUT( \ - BN4, BN2, \ - SW7, BN3, BN1, SW8, \ - SW4, SW5, SW6, \ - SW3, SW2, SW1 \ - ) \ - { \ - { ___, BN4, BN2, ___ }, \ - { SW7, BN3, BN1, SW8 }, \ - { SW4, SW5, SW6, ___ }, \ - { SW3, SW2, SW1, ___ }, \ - } diff --git a/keyboards/z34/info.json b/keyboards/z34/info.json index 87f4225c5e..e82a6dd304 100644 --- a/keyboards/z34/info.json +++ b/keyboards/z34/info.json @@ -34,47 +34,47 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"x": 0, "y": 0.93, "matrix": [0, 0]}, + {"x": 1, "y": 0.31, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0.28, "matrix": [0, 3]}, + {"x": 4, "y": 0.42, "matrix": [0, 4]}, - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, + {"x": 7, "y": 0.42, "matrix": [4, 0]}, + {"x": 8, "y": 0.28, "matrix": [4, 1]}, + {"x": 9, "y": 0, "matrix": [4, 2]}, + {"x": 10, "y": 0.31, "matrix": [4, 3]}, + {"x": 11, "y": 0.93, "matrix": [4, 4]}, - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"x": 0, "y": 1.93, "matrix": [1, 0]}, + {"x": 1, "y": 1.31, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1.28, "matrix": [1, 3]}, + {"x": 4, "y": 1.42, "matrix": [1, 4]}, - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, + {"x": 7, "y": 1.42, "matrix": [5, 0]}, + {"x": 8, "y": 1.28, "matrix": [5, 1]}, + {"x": 9, "y": 1, "matrix": [5, 2]}, + {"x": 10, "y": 1.31, "matrix": [5, 3]}, + {"x": 11, "y": 1.93, "matrix": [5, 4]}, - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"x": 0, "y": 2.93, "matrix": [2, 0]}, + {"x": 1, "y": 2.31, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2.28, "matrix": [2, 3]}, + {"x": 4, "y": 2.42, "matrix": [2, 4]}, - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, + {"x": 7, "y": 2.42, "matrix": [6, 0]}, + {"x": 8, "y": 2.28, "matrix": [6, 1]}, + {"x": 9, "y": 2, "matrix": [6, 2]}, + {"x": 10, "y": 2.31, "matrix": [6, 3]}, + {"x": 11, "y": 2.93, "matrix": [6, 4]}, - {"x": 3.5, "y": 3.5}, - {"x": 4.5, "y": 4}, + {"x": 3.5, "y": 3.5, "matrix": [3, 0]}, + {"x": 4.5, "y": 4, "matrix": [3, 1]}, - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 3.5} + {"x": 6.5, "y": 4, "matrix": [7, 0]}, + {"x": 7.5, "y": 3.5, "matrix": [7, 1]} ] } } diff --git a/keyboards/z34/z34.c b/keyboards/z34/z34.c deleted file mode 100644 index 779562e630..0000000000 --- a/keyboards/z34/z34.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com> - * - * 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/>. - */ - -#include "z34.h" diff --git a/keyboards/z34/z34.h b/keyboards/z34/z34.h deleted file mode 100644 index 3def2d4c2c..0000000000 --- a/keyboards/z34/z34.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com> - * - * 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/>. - */ - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout */ - -#define ___ KC_NO - -#define LAYOUT( \ - L05, L04, L03, L02, L01, R01, R02, R03, R04, R05, \ - L10, L09, L08, L07, L06, R06, R07, R08, R09, R10, \ - L15, L14, L13, L12, L11, R11, R12, R13, R14, R15, \ - L17, L16, R16, R17 \ - ) \ - { \ - { L05, L04, L03, L02, L01 }, \ - { L10, L09, L08, L07, L06 }, \ - { L15, L14, L13, L12, L11 }, \ - { L17, L16, ___, ___ , ___}, \ - { R01, R02, R03, R04, R05 }, \ - { R06, R07, R08, R09, R10 }, \ - { R11, R12, R13, R14, R15 }, \ - { R16, R17, ___, ___, ___ } \ - } - |