From e837a32b2b4d6eb96ffacad0022699d67c0f8f1e Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 19 Feb 2023 18:55:12 +1100 Subject: Move layouts for direct_pins boards to data driven (#19872) --- keyboards/0xcb/1337/1337.c | 2 +- keyboards/0xcb/1337/1337.h | 40 ------ keyboards/0xcb/1337/info.json | 18 +-- keyboards/0xcb/tutelpad/info.json | 16 +-- keyboards/0xcb/tutelpad/tutelpad.c | 2 +- keyboards/0xcb/tutelpad/tutelpad.h | 35 ----- keyboards/1k/1k.c | 16 --- keyboards/1k/1k.h | 33 ----- keyboards/1k/info.json | 2 +- keyboards/25keys/cassette42/cassette42.c | 16 --- keyboards/25keys/cassette42/cassette42.h | 34 ----- keyboards/25keys/cassette42/info.json | 9 +- keyboards/40percentclub/4pack/4pack.c | 2 +- keyboards/40percentclub/4pack/4pack.h | 33 ----- keyboards/40percentclub/4pack/info.json | 7 +- keyboards/40percentclub/nano/info.json | 14 +- keyboards/40percentclub/nano/nano.c | 1 - keyboards/40percentclub/nano/nano.h | 13 -- keyboards/40percentclub/nein/info.json | 18 +-- keyboards/40percentclub/nein/nein.c | 16 --- keyboards/40percentclub/nein/nein.h | 37 ------ keyboards/40percentclub/sixpack/info.json | 8 +- keyboards/40percentclub/sixpack/sixpack.c | 2 +- keyboards/40percentclub/sixpack/sixpack.h | 34 ----- keyboards/8pack/8pack.c | 1 - keyboards/8pack/8pack.h | 11 -- keyboards/8pack/info.json | 14 -- keyboards/8pack/rev11/info.json | 14 ++ keyboards/8pack/rev11/rev11.c | 1 - keyboards/8pack/rev11/rev11.h | 11 -- keyboards/8pack/rev12/info.json | 14 ++ keyboards/8pack/rev12/rev12.c | 1 - keyboards/8pack/rev12/rev12.h | 11 -- keyboards/a_dux/a_dux.c | 2 +- keyboards/a_dux/a_dux.h | 49 ------- keyboards/a_dux/info.json | 71 +++++----- keyboards/adafruit/macropad/info.json | 26 ++-- keyboards/adafruit/macropad/macropad.c | 2 +- keyboards/adafruit/macropad/macropad.h | 38 ------ keyboards/anavi/knob1/info.json | 2 +- keyboards/anavi/knob1/knob1.c | 2 +- keyboards/anavi/knob1/knob1.h | 30 ----- keyboards/anavi/macropad8/info.json | 11 +- keyboards/anavi/macropad8/macropad8.c | 1 - keyboards/anavi/macropad8/macropad8.h | 11 -- keyboards/arrayperipherals/1x4p1/1x4p1.c | 18 --- keyboards/arrayperipherals/1x4p1/1x4p1.h | 26 ---- keyboards/arrayperipherals/1x4p1/info.json | 10 +- keyboards/botanicalkeyboards/fm2u/fm2u.c | 17 --- keyboards/botanicalkeyboards/fm2u/fm2u.h | 113 ---------------- keyboards/botanicalkeyboards/fm2u/info.json | 38 ++++-- keyboards/bpiphany/sixshooter/info.json | 9 +- keyboards/bpiphany/sixshooter/sixshooter.h | 8 -- keyboards/clueboard/california/california.c | 1 - keyboards/clueboard/california/california.h | 3 - keyboards/crypt_macro/crypt_macro.c | 16 --- keyboards/crypt_macro/crypt_macro.h | 28 ---- keyboards/crypt_macro/info.json | 7 +- keyboards/dailycraft/owl8/info.json | 32 ++--- keyboards/dailycraft/owl8/owl8.c | 17 --- keyboards/dailycraft/owl8/owl8.h | 38 ------ keyboards/dailycraft/stickey4/info.json | 16 +-- keyboards/dailycraft/stickey4/stickey4.c | 17 --- keyboards/dailycraft/stickey4/stickey4.h | 36 ------ keyboards/dekunukem/duckypad/duckypad.c | 2 +- keyboards/dekunukem/duckypad/duckypad.h | 32 ----- keyboards/dekunukem/duckypad/info.json | 34 ++--- keyboards/ferris/0_1/info.json | 50 ++++++- keyboards/ferris/0_2/info.json | 50 ++++++- keyboards/ferris/info.json | 50 +------ keyboards/ferris/sweep/info.json | 51 ++++++++ keyboards/ferris/sweep/sweep.c | 2 +- keyboards/ferris/sweep/sweep.h | 48 ------- keyboards/geekboards/macropad_v2/info.json | 16 +-- keyboards/geekboards/macropad_v2/macropad_v2.c | 2 +- keyboards/geekboards/macropad_v2/macropad_v2.h | 26 ---- keyboards/handwired/aball/aball.c | 17 --- keyboards/handwired/aball/aball.h | 21 --- keyboards/handwired/aball/info.json | 2 +- keyboards/handwired/bdn9_ble/bdn9_ble.c | 1 - keyboards/handwired/bdn9_ble/bdn9_ble.h | 37 ------ keyboards/handwired/bdn9_ble/info.json | 18 +-- keyboards/handwired/bento/bento.c | 16 --- keyboards/handwired/bento/bento.h | 20 --- keyboards/handwired/bento/rev1/info.json | 12 +- keyboards/handwired/bento/rev1/rev1.c | 2 +- keyboards/handwired/bento/rev1/rev1.h | 36 ------ keyboards/handwired/dc/mc/001/001.c | 17 --- keyboards/handwired/dc/mc/001/001.h | 33 ----- keyboards/handwired/dc/mc/001/info.json | 10 +- keyboards/handwired/lemonpad/info.json | 12 +- keyboards/handwired/lemonpad/lemonpad.c | 17 --- keyboards/handwired/lemonpad/lemonpad.h | 38 ------ keyboards/handwired/stream_cheap/2x3/2x3.c | 1 - keyboards/handwired/stream_cheap/2x3/2x3.h | 11 -- keyboards/handwired/stream_cheap/2x3/info.json | 12 +- keyboards/handwired/stream_cheap/2x4/2x4.c | 1 - keyboards/handwired/stream_cheap/2x4/2x4.h | 12 -- keyboards/handwired/stream_cheap/2x4/info.json | 16 +-- keyboards/handwired/stream_cheap/2x5/2x5.c | 1 - keyboards/handwired/stream_cheap/2x5/2x5.h | 11 -- keyboards/handwired/stream_cheap/2x5/info.json | 20 +-- keyboards/ianklug/grooveboard/grooveboard.c | 17 --- keyboards/ianklug/grooveboard/grooveboard.h | 33 ----- keyboards/ianklug/grooveboard/info.json | 8 +- keyboards/kb_elmo/isolation/info.json | 2 +- keyboards/kb_elmo/isolation/isolation.c | 17 --- keyboards/kb_elmo/isolation/isolation.h | 25 ---- keyboards/keebio/bamfk1/bamfk1.c | 4 - keyboards/keebio/bamfk1/bamfk1.h | 14 -- keyboards/keebio/bamfk1/info.json | 14 +- keyboards/keebio/bdn9/bdn9.c | 1 - keyboards/keebio/bdn9/bdn9.h | 7 - keyboards/keebio/bdn9/info.json | 18 +-- keyboards/keebio/bdn9/rev1/rev1.c | 2 +- keyboards/keebio/bdn9/rev1/rev1.h | 38 ------ keyboards/keebio/bdn9/rev2/rev2.c | 2 +- keyboards/keebio/bdn9/rev2/rev2.h | 38 ------ keyboards/keebio/choconum/choconum.c | 1 - keyboards/keebio/choconum/choconum.h | 49 ------- keyboards/keebio/choconum/info.json | 74 +++++------ keyboards/keebio/stick/info.json | 24 ++-- keyboards/keebio/stick/stick.c | 2 +- keyboards/keebio/stick/stick.h | 26 ---- keyboards/keebio/tukey/info.json | 4 +- keyboards/keebio/tukey/tukey.c | 16 --- keyboards/keebio/tukey/tukey.h | 20 --- keyboards/keyhive/uno/info.json | 4 +- keyboards/keyhive/uno/rev1/rev1.h | 25 ---- keyboards/keyhive/uno/rev2/rev2.h | 25 ---- keyboards/keyhive/uno/uno.c | 17 --- keyboards/keyhive/uno/uno.h | 25 ---- keyboards/ktec/staryu/info.json | 8 +- keyboards/ktec/staryu/staryu.c | 17 --- keyboards/ktec/staryu/staryu.h | 28 ---- keyboards/leafcutterlabs/bigknob/bigknob.c | 17 --- keyboards/leafcutterlabs/bigknob/bigknob.h | 27 ---- keyboards/leafcutterlabs/bigknob/info.json | 11 +- keyboards/littlealby/mute/info.json | 4 +- keyboards/littlealby/mute/mute.c | 16 --- keyboards/littlealby/mute/mute.h | 24 ---- keyboards/macro3/info.json | 16 +-- keyboards/macro3/macro3.c | 2 +- keyboards/macro3/macro3.h | 16 --- keyboards/makeymakey/info.json | 36 +++--- keyboards/makeymakey/makeymakey.c | 2 +- keyboards/makeymakey/makeymakey.h | 32 ----- keyboards/miniaxe/info.json | 49 ++++++- keyboards/miniaxe/miniaxe.c | 16 --- keyboards/miniaxe/miniaxe.h | 49 ------- keyboards/minimacro5/info.json | 8 +- keyboards/minimacro5/minimacro5.c | 1 - keyboards/minimacro5/minimacro5.h | 9 -- keyboards/mixi/info.json | 18 +-- keyboards/mixi/mixi.c | 2 +- keyboards/mixi/mixi.h | 13 -- keyboards/novelkeys/nk1/info.json | 4 +- keyboards/novelkeys/nk1/nk1.c | 17 --- keyboards/novelkeys/nk1/nk1.h | 25 ---- keyboards/nullbitsco/scramble/info.json | 31 +---- keyboards/nullbitsco/scramble/scramble.c | 18 --- keyboards/nullbitsco/scramble/scramble.h | 34 ----- keyboards/nullbitsco/scramble/v1/v1.h | 2 +- keyboards/nullbitsco/scramble/v2/v2.h | 2 +- keyboards/obosob/steal_this_keyboard/info.json | 68 +++++----- .../steal_this_keyboard/steal_this_keyboard.c | 16 --- .../steal_this_keyboard/steal_this_keyboard.h | 46 ------- keyboards/peranekofactory/tone/rev1/info.json | 11 +- keyboards/peranekofactory/tone/rev1/rev1.c | 17 --- keyboards/peranekofactory/tone/rev1/rev1.h | 35 ----- keyboards/peranekofactory/tone/rev2/info.json | 11 +- keyboards/peranekofactory/tone/rev2/rev2.c | 17 --- keyboards/peranekofactory/tone/rev2/rev2.h | 35 ----- keyboards/ploopyco/mouse/info.json | 16 +-- keyboards/ploopyco/mouse/mouse.h | 3 - keyboards/ploopyco/trackball/info.json | 10 +- keyboards/ploopyco/trackball/trackball.h | 3 - keyboards/ploopyco/trackball_mini/info.json | 10 +- keyboards/ploopyco/trackball_mini/trackball_mini.h | 3 - keyboards/ploopyco/trackball_nano/info.json | 2 +- keyboards/ploopyco/trackball_nano/trackball_nano.h | 2 - keyboards/sendyyeah/pix/info.json | 10 +- keyboards/sendyyeah/pix/pix.c | 2 +- keyboards/sendyyeah/pix/pix.h | 23 ---- keyboards/sergiopoverony/creator_pro/creator_pro.h | 10 -- keyboards/sergiopoverony/creator_pro/info.json | 18 +-- keyboards/spaceman/2_milk/2_milk.c | 16 --- keyboards/spaceman/2_milk/2_milk.h | 26 ---- keyboards/spaceman/2_milk/info.json | 5 +- keyboards/splitkb/zima/info.json | 24 ++-- keyboards/splitkb/zima/zima.c | 2 +- keyboards/splitkb/zima/zima.h | 29 ----- keyboards/synthlabs/solo/solo.c | 2 +- keyboards/synthlabs/solo/solo.h | 41 ------ keyboards/tominabox1/bigboy/bigboy.c | 2 +- keyboards/tominabox1/bigboy/bigboy.h | 34 ----- keyboards/tominabox1/bigboy/info.json | 15 ++- keyboards/ungodly/nines/info.json | 18 +-- keyboards/ungodly/nines/nines.c | 2 +- keyboards/ungodly/nines/nines.h | 37 ------ keyboards/winkeys/mini_winni/info.json | 11 +- keyboards/winkeys/mini_winni/mini_winni.c | 18 --- keyboards/winkeys/mini_winni/mini_winni.h | 27 ---- keyboards/winry/winry315/info.json | 144 ++++++++++----------- keyboards/winry/winry315/winry315.h | 60 --------- keyboards/xiudi/xd002/info.json | 4 +- keyboards/xiudi/xd002/xd002.c | 16 --- keyboards/xiudi/xd002/xd002.h | 33 ----- keyboards/xiudi/xd004/info.json | 7 +- keyboards/xiudi/xd004/xd004.c | 1 - keyboards/xiudi/xd004/xd004.h | 15 --- keyboards/yatara/drink_me/drink_me.c | 17 --- keyboards/yatara/drink_me/drink_me.h | 25 ---- keyboards/yatara/drink_me/info.json | 24 +--- keyboards/yeehaw/info.json | 17 ++- keyboards/yeehaw/yeehaw.c | 16 --- keyboards/yeehaw/yeehaw.h | 25 ---- keyboards/yushakobo/quick7/info.json | 12 +- keyboards/yushakobo/quick7/quick7.c | 17 --- keyboards/yushakobo/quick7/quick7.h | 38 ------ keyboards/yynmt/acperience12/acperience12.c | 17 --- keyboards/yynmt/acperience12/acperience12.h | 23 ---- keyboards/yynmt/acperience12/rev1/info.json | 18 ++- keyboards/yynmt/acperience12/rev1/rev1.c | 17 --- keyboards/yynmt/acperience12/rev1/rev1.h | 37 ------ keyboards/z12/info.json | 24 ++-- keyboards/z12/z12.c | 2 +- keyboards/z12/z12.h | 34 ----- keyboards/z34/info.json | 68 +++++----- keyboards/z34/z34.c | 17 --- keyboards/z34/z34.h | 39 ------ 231 files changed, 965 insertions(+), 3523 deletions(-) delete mode 100644 keyboards/0xcb/1337/1337.h delete mode 100644 keyboards/0xcb/tutelpad/tutelpad.h delete mode 100644 keyboards/1k/1k.c delete mode 100644 keyboards/1k/1k.h delete mode 100644 keyboards/25keys/cassette42/cassette42.c delete mode 100644 keyboards/25keys/cassette42/cassette42.h delete mode 100644 keyboards/40percentclub/4pack/4pack.h delete mode 100644 keyboards/40percentclub/nano/nano.c delete mode 100644 keyboards/40percentclub/nano/nano.h delete mode 100644 keyboards/40percentclub/nein/nein.c delete mode 100644 keyboards/40percentclub/nein/nein.h delete mode 100644 keyboards/40percentclub/sixpack/sixpack.h delete mode 100644 keyboards/8pack/8pack.c delete mode 100644 keyboards/8pack/8pack.h delete mode 100644 keyboards/8pack/rev11/rev11.c delete mode 100644 keyboards/8pack/rev11/rev11.h delete mode 100644 keyboards/8pack/rev12/rev12.c delete mode 100644 keyboards/8pack/rev12/rev12.h delete mode 100644 keyboards/a_dux/a_dux.h delete mode 100644 keyboards/adafruit/macropad/macropad.h delete mode 100644 keyboards/anavi/knob1/knob1.h delete mode 100644 keyboards/anavi/macropad8/macropad8.c delete mode 100644 keyboards/anavi/macropad8/macropad8.h delete mode 100644 keyboards/arrayperipherals/1x4p1/1x4p1.c delete mode 100644 keyboards/arrayperipherals/1x4p1/1x4p1.h delete mode 100644 keyboards/botanicalkeyboards/fm2u/fm2u.c delete mode 100644 keyboards/botanicalkeyboards/fm2u/fm2u.h delete mode 100644 keyboards/clueboard/california/california.c delete mode 100644 keyboards/clueboard/california/california.h delete mode 100644 keyboards/crypt_macro/crypt_macro.c delete mode 100644 keyboards/crypt_macro/crypt_macro.h delete mode 100644 keyboards/dailycraft/owl8/owl8.c delete mode 100644 keyboards/dailycraft/owl8/owl8.h delete mode 100644 keyboards/dailycraft/stickey4/stickey4.c delete mode 100644 keyboards/dailycraft/stickey4/stickey4.h delete mode 100644 keyboards/dekunukem/duckypad/duckypad.h delete mode 100644 keyboards/ferris/sweep/sweep.h delete mode 100644 keyboards/geekboards/macropad_v2/macropad_v2.h delete mode 100644 keyboards/handwired/aball/aball.c delete mode 100644 keyboards/handwired/aball/aball.h delete mode 100644 keyboards/handwired/bdn9_ble/bdn9_ble.c delete mode 100644 keyboards/handwired/bdn9_ble/bdn9_ble.h delete mode 100644 keyboards/handwired/bento/bento.c delete mode 100644 keyboards/handwired/bento/bento.h delete mode 100644 keyboards/handwired/bento/rev1/rev1.h delete mode 100644 keyboards/handwired/dc/mc/001/001.c delete mode 100644 keyboards/handwired/dc/mc/001/001.h delete mode 100644 keyboards/handwired/lemonpad/lemonpad.c delete mode 100644 keyboards/handwired/lemonpad/lemonpad.h delete mode 100644 keyboards/handwired/stream_cheap/2x3/2x3.c delete mode 100644 keyboards/handwired/stream_cheap/2x3/2x3.h delete mode 100644 keyboards/handwired/stream_cheap/2x4/2x4.c delete mode 100644 keyboards/handwired/stream_cheap/2x4/2x4.h delete mode 100644 keyboards/handwired/stream_cheap/2x5/2x5.c delete mode 100644 keyboards/handwired/stream_cheap/2x5/2x5.h delete mode 100644 keyboards/ianklug/grooveboard/grooveboard.c delete mode 100644 keyboards/ianklug/grooveboard/grooveboard.h delete mode 100644 keyboards/kb_elmo/isolation/isolation.c delete mode 100644 keyboards/kb_elmo/isolation/isolation.h delete mode 100644 keyboards/keebio/bamfk1/bamfk1.c delete mode 100644 keyboards/keebio/bamfk1/bamfk1.h delete mode 100644 keyboards/keebio/bdn9/bdn9.c delete mode 100644 keyboards/keebio/bdn9/bdn9.h delete mode 100644 keyboards/keebio/bdn9/rev1/rev1.h delete mode 100644 keyboards/keebio/bdn9/rev2/rev2.h delete mode 100644 keyboards/keebio/choconum/choconum.c delete mode 100644 keyboards/keebio/choconum/choconum.h delete mode 100644 keyboards/keebio/stick/stick.h delete mode 100644 keyboards/keebio/tukey/tukey.c delete mode 100644 keyboards/keebio/tukey/tukey.h delete mode 100644 keyboards/keyhive/uno/rev1/rev1.h delete mode 100644 keyboards/keyhive/uno/rev2/rev2.h delete mode 100644 keyboards/keyhive/uno/uno.c delete mode 100644 keyboards/keyhive/uno/uno.h delete mode 100755 keyboards/ktec/staryu/staryu.c delete mode 100755 keyboards/ktec/staryu/staryu.h delete mode 100644 keyboards/leafcutterlabs/bigknob/bigknob.c delete mode 100644 keyboards/leafcutterlabs/bigknob/bigknob.h delete mode 100644 keyboards/littlealby/mute/mute.c delete mode 100644 keyboards/littlealby/mute/mute.h delete mode 100644 keyboards/macro3/macro3.h delete mode 100644 keyboards/makeymakey/makeymakey.h delete mode 100644 keyboards/miniaxe/miniaxe.c delete mode 100644 keyboards/miniaxe/miniaxe.h delete mode 100644 keyboards/minimacro5/minimacro5.c delete mode 100644 keyboards/minimacro5/minimacro5.h delete mode 100644 keyboards/mixi/mixi.h delete mode 100644 keyboards/novelkeys/nk1/nk1.c delete mode 100644 keyboards/novelkeys/nk1/nk1.h delete mode 100644 keyboards/nullbitsco/scramble/scramble.c delete mode 100644 keyboards/nullbitsco/scramble/scramble.h delete mode 100644 keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c delete mode 100644 keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h delete mode 100644 keyboards/peranekofactory/tone/rev1/rev1.c delete mode 100644 keyboards/peranekofactory/tone/rev1/rev1.h delete mode 100644 keyboards/peranekofactory/tone/rev2/rev2.c delete mode 100644 keyboards/peranekofactory/tone/rev2/rev2.h delete mode 100644 keyboards/sendyyeah/pix/pix.h delete mode 100644 keyboards/spaceman/2_milk/2_milk.c delete mode 100644 keyboards/spaceman/2_milk/2_milk.h delete mode 100644 keyboards/splitkb/zima/zima.h delete mode 100644 keyboards/synthlabs/solo/solo.h delete mode 100755 keyboards/tominabox1/bigboy/bigboy.h delete mode 100644 keyboards/ungodly/nines/nines.h delete mode 100644 keyboards/winkeys/mini_winni/mini_winni.c delete mode 100644 keyboards/winkeys/mini_winni/mini_winni.h delete mode 100644 keyboards/xiudi/xd002/xd002.c delete mode 100644 keyboards/xiudi/xd002/xd002.h delete mode 100644 keyboards/xiudi/xd004/xd004.c delete mode 100644 keyboards/xiudi/xd004/xd004.h delete mode 100644 keyboards/yatara/drink_me/drink_me.c delete mode 100644 keyboards/yatara/drink_me/drink_me.h delete mode 100644 keyboards/yeehaw/yeehaw.c delete mode 100644 keyboards/yeehaw/yeehaw.h delete mode 100644 keyboards/yushakobo/quick7/quick7.c delete mode 100644 keyboards/yushakobo/quick7/quick7.h delete mode 100644 keyboards/yynmt/acperience12/acperience12.c delete mode 100644 keyboards/yynmt/acperience12/acperience12.h delete mode 100644 keyboards/yynmt/acperience12/rev1/rev1.c delete mode 100644 keyboards/yynmt/acperience12/rev1/rev1.h delete mode 100644 keyboards/z12/z12.h delete mode 100644 keyboards/z34/z34.c delete mode 100644 keyboards/z34/z34.h (limited to 'keyboards') 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 . */ -#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 . -*/ -#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 . */ -#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 . - */ - -#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 - * - * 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 . - */ -#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 - * - * 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 . - */ -#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 . - */ -#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 . - */ -#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 . */ -#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 . - */ -#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 . - */ -#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 . - */ -#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 . */ -#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 . - */ -#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 . */ -#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 David Philip Barr <@davidphilipbarr> Pierre Chevalier - * - * 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 . - */ - -#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 . */ -#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 - * - * 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 . - */ - -#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 // SPDX-License-Identifier: GPL-2.0-or-later -#include "encoder.h" +#include "quantum.h" #include 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 - * - * 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 . - */ - -#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 . -*/ - -#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 . -*/ - -#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 . - */ - -#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 . - */ - -#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_isoe