From e40b6ca3b05e50253c3f6bbc08673e1720ddd9be Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 1 Apr 2023 13:09:53 +1100 Subject: Move split layouts to data driven (#20290) --- keyboards/alt34/rev1/info.json | 68 ++-- keyboards/alt34/rev1/rev1.h | 41 --- keyboards/bastardkb/dilemma/3x5_2/3x5_2.h | 37 -- keyboards/bastardkb/dilemma/3x5_2/info.json | 75 ++-- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 2 +- keyboards/bastardkb/dilemma/3x5_3/3x5_3.h | 39 -- keyboards/bastardkb/dilemma/3x5_3/info.json | 79 ++-- keyboards/bastardkb/dilemma/dilemma.h | 10 - keyboards/bastardkb/scylla/info.json | 127 ++++--- keyboards/bastardkb/scylla/scylla.c | 2 +- keyboards/bastardkb/scylla/scylla.h | 44 --- keyboards/bastardkb/skeletyl/info.json | 79 ++-- keyboards/bastardkb/skeletyl/skeletyl.c | 2 +- keyboards/bastardkb/skeletyl/skeletyl.h | 40 -- keyboards/bastardkb/tbk/info.json | 116 +++--- keyboards/bastardkb/tbk/tbk.h | 43 --- keyboards/bastardkb/tbkmini/info.json | 91 ++--- keyboards/bastardkb/tbkmini/tbkmini.c | 2 +- keyboards/bastardkb/tbkmini/tbkmini.h | 40 -- keyboards/bluebell/swoop/info.json | 79 ++-- keyboards/bluebell/swoop/swoop.h | 36 -- keyboards/centromere/centromere.h | 36 -- keyboards/centromere/info.json | 173 +++++---- keyboards/chocv/chocv.h | 43 --- keyboards/chocv/info.json | 72 ++-- keyboards/crkbd/info.json | 104 +----- keyboards/crkbd/r2g/info.json | 107 +++++- keyboards/crkbd/r2g/r2g.c | 2 +- keyboards/crkbd/r2g/r2g.h | 59 --- keyboards/crkbd/rev1/info.json | 107 +++++- keyboards/crkbd/rev1/rev1.c | 2 +- keyboards/crkbd/rev1/rev1.h | 59 --- keyboards/dailycraft/wings42/rev1/info.json | 88 ++--- keyboards/dailycraft/wings42/rev1/rev1.h | 44 --- keyboards/dailycraft/wings42/rev2/info.json | 96 ++--- keyboards/dailycraft/wings42/rev2/rev2.h | 46 --- keyboards/dumbo/dumbo.h | 44 --- keyboards/dumbo/info.json | 88 ++--- keyboards/eek/silk_down/info.json | 51 +++ keyboards/eek/silk_down/silk_down.h | 39 -- keyboards/eek/silk_up/info.json | 51 +++ keyboards/eek/silk_up/silk_up.h | 39 -- keyboards/ferris/0_1/0_1.h | 44 --- keyboards/ferris/0_1/info.json | 71 ++-- keyboards/ferris/0_2/0_2.h | 44 --- keyboards/ferris/0_2/info.json | 71 ++-- keyboards/gboards/gergoplex/gergoplex.h | 18 - keyboards/gboards/gergoplex/info.json | 76 ++-- keyboards/gummykey/gummykey.h | 28 -- keyboards/gummykey/info.json | 130 ++++--- keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c | 2 +- keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h | 38 -- .../handwired/dactyl_manuform/3x5_3/info.json | 72 ++-- keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h | 47 --- .../handwired/dactyl_manuform/5x6_6/info.json | 128 +++---- keyboards/handwired/elrgo_s/elrgo_s.h | 38 -- keyboards/handwired/elrgo_s/info.json | 101 ++--- keyboards/handwired/pteron38/info.json | 76 ++-- keyboards/handwired/pteron38/pteron38.h | 31 -- keyboards/ibnuda/squiggle/rev1/info.json | 407 ++++++++++++++------- keyboards/ibnuda/squiggle/rev1/rev1.h | 117 ------ keyboards/ingrained/info.json | 337 +++++------------ keyboards/ingrained/ingrained.h | 47 --- keyboards/kakunpc/suihankey/split/alpha/alpha.h | 45 --- keyboards/kakunpc/suihankey/split/alpha/info.json | 54 ++- keyboards/kakunpc/suihankey/split/info.json | 51 +-- keyboards/kakunpc/suihankey/split/rev1/info.json | 54 ++- keyboards/kakunpc/suihankey/split/rev1/rev1.h | 47 --- keyboards/maple_computing/minidox/rev1/info.json | 49 ++- keyboards/maple_computing/minidox/rev1/rev1.h | 25 -- keyboards/obosob/arch_36/arch_36.h | 43 --- keyboards/obosob/arch_36/info.json | 76 ++-- keyboards/pierce/info.json | 75 ++-- keyboards/pierce/pierce.h | 31 -- keyboards/pinky/3/3.h | 22 -- keyboards/pinky/3/info.json | 107 +++--- keyboards/pinky/4/4.h | 25 -- keyboards/pinky/4/info.json | 136 +++---- keyboards/pisces/info.json | 46 ++- keyboards/pisces/pisces.c | 2 +- keyboards/pisces/pisces.h | 41 --- keyboards/pteron36/info.json | 156 ++++---- keyboards/pteron36/pteron36.c | 2 +- keyboards/pteron36/pteron36.h | 59 --- keyboards/splitkb/kyria/rev1/info.json | 173 ++++++--- keyboards/splitkb/kyria/rev1/rev1.c | 2 +- keyboards/splitkb/kyria/rev1/rev1.h | 67 ---- keyboards/splitkb/kyria/rev2/info.json | 171 ++++++--- keyboards/splitkb/kyria/rev2/rev2.c | 2 +- keyboards/splitkb/kyria/rev2/rev2.h | 67 ---- keyboards/torn/info.json | 95 ++--- keyboards/torn/torn.h | 16 - keyboards/yanghu/unicorne/info.json | 88 ++--- keyboards/yanghu/unicorne/unicorne.h | 25 -- keyboards/yoichiro/lunakey_mini/info.json | 96 ++--- keyboards/yoichiro/lunakey_mini/lunakey_mini.h | 44 --- keyboards/yoichiro/lunakey_pico/info.json | 96 ++--- keyboards/yoichiro/lunakey_pico/lunakey_pico.h | 23 -- 98 files changed, 2642 insertions(+), 3794 deletions(-) delete mode 100644 keyboards/alt34/rev1/rev1.h delete mode 100644 keyboards/bastardkb/dilemma/3x5_2/3x5_2.h delete mode 100644 keyboards/bastardkb/dilemma/3x5_3/3x5_3.h delete mode 100644 keyboards/bastardkb/scylla/scylla.h delete mode 100644 keyboards/bastardkb/skeletyl/skeletyl.h delete mode 100644 keyboards/bastardkb/tbk/tbk.h delete mode 100644 keyboards/bastardkb/tbkmini/tbkmini.h delete mode 100644 keyboards/bluebell/swoop/swoop.h delete mode 100644 keyboards/chocv/chocv.h delete mode 100644 keyboards/crkbd/r2g/r2g.h delete mode 100644 keyboards/crkbd/rev1/rev1.h delete mode 100644 keyboards/dailycraft/wings42/rev1/rev1.h delete mode 100644 keyboards/dailycraft/wings42/rev2/rev2.h delete mode 100644 keyboards/dumbo/dumbo.h create mode 100644 keyboards/eek/silk_down/info.json delete mode 100644 keyboards/eek/silk_down/silk_down.h create mode 100644 keyboards/eek/silk_up/info.json delete mode 100644 keyboards/eek/silk_up/silk_up.h delete mode 100644 keyboards/ferris/0_1/0_1.h delete mode 100644 keyboards/ferris/0_2/0_2.h delete mode 100644 keyboards/gummykey/gummykey.h delete mode 100644 keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h delete mode 100644 keyboards/handwired/elrgo_s/elrgo_s.h delete mode 100644 keyboards/handwired/pteron38/pteron38.h delete mode 100644 keyboards/ibnuda/squiggle/rev1/rev1.h delete mode 100644 keyboards/ingrained/ingrained.h delete mode 100644 keyboards/kakunpc/suihankey/split/alpha/alpha.h delete mode 100644 keyboards/kakunpc/suihankey/split/rev1/rev1.h delete mode 100644 keyboards/maple_computing/minidox/rev1/rev1.h delete mode 100644 keyboards/obosob/arch_36/arch_36.h delete mode 100644 keyboards/pierce/pierce.h delete mode 100644 keyboards/pinky/3/3.h delete mode 100644 keyboards/pinky/4/4.h delete mode 100644 keyboards/pisces/pisces.h delete mode 100644 keyboards/pteron36/pteron36.h delete mode 100644 keyboards/splitkb/kyria/rev1/rev1.h delete mode 100644 keyboards/splitkb/kyria/rev2/rev2.h delete mode 100644 keyboards/yoichiro/lunakey_mini/lunakey_mini.h delete mode 100644 keyboards/yoichiro/lunakey_pico/lunakey_pico.h diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json index b49357c686..cf90324c14 100644 --- a/keyboards/alt34/rev1/info.json +++ b/keyboards/alt34/rev1/info.json @@ -19,47 +19,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}, + {"matrix": [0, 0], "x": 0, "y": 0.93}, + {"matrix": [0, 1], "x": 1, "y": 0.31}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.28}, + {"matrix": [0, 4], "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}, + {"matrix": [4, 4], "x": 7, "y": 0.42}, + {"matrix": [4, 3], "x": 8, "y": 0.28}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0.31}, + {"matrix": [4, 0], "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}, + {"matrix": [1, 0], "x": 0, "y": 1.93}, + {"matrix": [1, 1], "x": 1, "y": 1.31}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.28}, + {"matrix": [1, 4], "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}, + {"matrix": [5, 4], "x": 7, "y": 1.42}, + {"matrix": [5, 3], "x": 8, "y": 1.28}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1.31}, + {"matrix": [5, 0], "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}, + {"matrix": [2, 0], "x": 0, "y": 2.93}, + {"matrix": [2, 1], "x": 1, "y": 2.31}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.28}, + {"matrix": [2, 4], "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}, + {"matrix": [6, 4], "x": 7, "y": 2.42}, + {"matrix": [6, 3], "x": 8, "y": 2.28}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2.31}, + {"matrix": [6, 0], "x": 11, "y": 2.93}, - {"x": 3.5, "y": 3.45}, - {"x": 4.5, "y": 3.7}, + {"matrix": [3, 3], "x": 3.5, "y": 3.45}, + {"matrix": [3, 4], "x": 4.5, "y": 3.7}, - {"x": 6.5, "y": 3.7}, - {"x": 7.5, "y": 3.45} + {"matrix": [7, 4], "x": 6.5, "y": 3.7}, + {"matrix": [7, 3], "x": 7.5, "y": 3.45} ] } } diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h deleted file mode 100644 index 115415bb5f..0000000000 --- a/keyboards/alt34/rev1/rev1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 Tommy Alatalo <@altosys> - -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 - -/* left hand right hand */ -#define LAYOUT_split_3x5_2(\ - K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ - K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ - K3_2, K3_3, K3_4, K3_5 )\ -/* matrix positions */\ -{\ - {K0_0, K0_1, K0_2, K0_3, K0_4},\ - {K1_0, K1_1, K1_2, K1_3, K1_4},\ - {K2_0, K2_1, K2_2, K2_3, K2_4},\ - {____, ____, ____, K3_2, K3_3},\ - \ - {K0_9, K0_8, K0_7, K0_6, K0_5},\ - {K1_9, K1_8, K1_7, K1_6, K1_5},\ - {K2_9, K2_8, K2_7, K2_6, K2_5},\ - {____, ____, ____, K3_5, K3_4} \ -} diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h deleted file mode 100644 index 7deb32d917..0000000000 --- a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -// clang-format off -#define LAYOUT_split_3x5_2( \ - k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ - k30, k32, k72, k70 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, KC_NO, k32, KC_NO, KC_NO }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 }, \ - { k60, k61, k62, k63, k64 }, \ - { k70, KC_NO, k72, KC_NO, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json index a758541149..bfd12e81d0 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/info.json @@ -7,40 +7,47 @@ "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "L30", "x": 4, "y": 3 }, - { "label": "L32", "x": 5, "y": 3 }, - { "label": "R32", "x": 10, "y": 3 }, - { "label": "R30", "x": 11, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0}, + {"matrix": [4, 1], "x": 14, "y": 0}, + {"matrix": [4, 0], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1}, + {"matrix": [5, 1], "x": 14, "y": 1}, + {"matrix": [5, 0], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2}, + {"matrix": [6, 1], "x": 14, "y": 2}, + {"matrix": [6, 0], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 4, "y": 3}, + {"matrix": [3, 2], "x": 5, "y": 3}, + + {"matrix": [7, 2], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} ] } } diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 0b6c657fda..b9787f473e 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "3x5_3.h" +#include "quantum.h" /** * LEDs index. diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h deleted file mode 100644 index 566d5b81d2..0000000000 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 "dilemma.h" - -// clang-format off -#define LAYOUT_split_3x5_3( \ - k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ - k32, k30, k31, k71, k70, k72 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, k31, k32, KC_NO, KC_NO }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 }, \ - { k60, k61, k62, k63, k64 }, \ - { k70, k71, k72, KC_NO, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index 3944f33a65..d9f0f15f2c 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -21,42 +21,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "L32", "x": 4, "y": 3 }, - { "label": "L33", "x": 5, "y": 3 }, - { "label": "L34", "x": 6, "y": 3 }, - { "label": "R32", "x": 11, "y": 3 }, - { "label": "R33", "x": 10, "y": 3 }, - { "label": "R34", "x": 9, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0}, + {"matrix": [4, 1], "x": 14, "y": 0}, + {"matrix": [4, 0], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1}, + {"matrix": [5, 1], "x": 14, "y": 1}, + {"matrix": [5, 0], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2}, + {"matrix": [6, 1], "x": 14, "y": 2}, + {"matrix": [6, 0], "x": 15, "y": 2}, + + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 0], "x": 5, "y": 3}, + {"matrix": [3, 1], "x": 6, "y": 3}, + + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 0], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3} ] } } diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h index f2c0784533..eefdd5babf 100644 --- a/keyboards/bastardkb/dilemma/dilemma.h +++ b/keyboards/bastardkb/dilemma/dilemma.h @@ -17,16 +17,6 @@ #pragma once -// clang-format off -#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled) -# include "3x5_2.h" -#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3) -# include "3x5_3.h" -#else -# error "Unsuported format" -#endif -// clang-format on - #include "quantum.h" #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json index d8120f5070..682b2dc6db 100644 --- a/keyboards/bastardkb/scylla/info.json +++ b/keyboards/bastardkb/scylla/info.json @@ -6,64 +6,75 @@ "layouts": { "LAYOUT_split_4x6_5": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "L05", "x": 5, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "R05", "x": 16, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "L15", "x": 5, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "R15", "x": 16, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "L25", "x": 5, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "R25", "x": 16, "y": 2 }, - { "label": "L30", "x": 0, "y": 3 }, - { "label": "L31", "x": 1, "y": 3 }, - { "label": "L32", "x": 2, "y": 3 }, - { "label": "L33", "x": 3, "y": 3 }, - { "label": "L34", "x": 4, "y": 3 }, - { "label": "L35", "x": 5, "y": 3 }, - { "label": "R30", "x": 11, "y": 3 }, - { "label": "R31", "x": 12, "y": 3 }, - { "label": "R32", "x": 13, "y": 3 }, - { "label": "R33", "x": 14, "y": 3 }, - { "label": "R34", "x": 15, "y": 3 }, - { "label": "R35", "x": 16, "y": 3 }, - { "label": "L43", "x": 5, "y": 4 }, - { "label": "L44", "x": 6, "y": 4 }, - { "label": "L45", "x": 7, "y": 4 }, - { "label": "R40", "x": 9, "y": 4 }, - { "label": "R41", "x": 10, "y": 4 }, - { "label": "R40", "x": 11, "y": 4 }, - { "label": "L52", "x": 6, "y": 5 }, - { "label": "L53", "x": 7, "y": 5 }, - { "label": "R52", "x": 9, "y": 5 }, - { "label": "R53", "x": 10, "y": 5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 1], "x": 15, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 1], "x": 15, "y": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 3], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 6, "y": 4}, + {"matrix": [4, 1], "x": 7, "y": 4}, + + {"matrix": [9, 1], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + + {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 7, "y": 5}, + + {"matrix": [9, 2], "x": 9, "y": 5}, + {"matrix": [9, 5], "x": 10, "y": 5} ] } } diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c index 504cb0a219..7aaa0fc1ce 100644 --- a/keyboards/bastardkb/scylla/scylla.c +++ b/keyboards/bastardkb/scylla/scylla.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "scylla.h" +#include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/scylla/scylla.h b/keyboards/bastardkb/scylla/scylla.h deleted file mode 100644 index 4039ad3a94..0000000000 --- a/keyboards/bastardkb/scylla/scylla.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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" - -// clang-format off -#define LAYOUT_split_4x6_5( \ - k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ - k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ - k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ - k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ - k43, k44, k41, k91, k94, k93, \ - k45, k42, k92, k95 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { KC_NO, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { k80, k81, k82, k83, k84, k85 }, \ - { KC_NO, k91, k92, k93, k94, k95 }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json index 90568ef1fd..b325ca7196 100644 --- a/keyboards/bastardkb/skeletyl/info.json +++ b/keyboards/bastardkb/skeletyl/info.json @@ -7,42 +7,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "L33", "x": 4, "y": 3 }, - { "label": "L34", "x": 5, "y": 3 }, - { "label": "L31", "x": 6, "y": 3 }, - { "label": "R33", "x": 9, "y": 3 }, - { "label": "R34", "x": 10, "y": 3 }, - { "label": "R31", "x": 11, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0}, + {"matrix": [4, 1], "x": 14, "y": 0}, + {"matrix": [4, 0], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1}, + {"matrix": [5, 1], "x": 14, "y": 1}, + {"matrix": [5, 0], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2}, + {"matrix": [6, 1], "x": 14, "y": 2}, + {"matrix": [6, 0], "x": 15, "y": 2}, + + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 0], "x": 6, "y": 3}, + + {"matrix": [7, 0], "x": 9, "y": 3}, + {"matrix": [7, 3], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 11, "y": 3} ] } } diff --git a/keyboards/bastardkb/skeletyl/skeletyl.c b/keyboards/bastardkb/skeletyl/skeletyl.c index b72becbb25..6c65c3fa87 100644 --- a/keyboards/bastardkb/skeletyl/skeletyl.c +++ b/keyboards/bastardkb/skeletyl/skeletyl.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "skeletyl.h" +#include "quantum.h" /** * LEDs index. diff --git a/keyboards/bastardkb/skeletyl/skeletyl.h b/keyboards/bastardkb/skeletyl/skeletyl.h deleted file mode 100644 index 6d8073153f..0000000000 --- a/keyboards/bastardkb/skeletyl/skeletyl.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly DELAY - * - * 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" - -// clang-format off -#define LAYOUT_split_3x5_3( \ - k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ - k32, k33, k30, k70, k73, k72 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, KC_NO, k32, k33, KC_NO }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 }, \ - { k60, k61, k62, k63, k64 }, \ - { k70, KC_NO, k72, k73, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 247e86160f..43254b2804 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -18,64 +18,64 @@ "layouts": { "LAYOUT_split_4x6_5": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "L05", "x": 5, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "R05", "x": 16, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "L15", "x": 5, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "R15", "x": 16, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "L25", "x": 5, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "R25", "x": 16, "y": 2 }, - { "label": "L30", "x": 0, "y": 3 }, - { "label": "L31", "x": 1, "y": 3 }, - { "label": "L32", "x": 2, "y": 3 }, - { "label": "L33", "x": 3, "y": 3 }, - { "label": "L34", "x": 4, "y": 3 }, - { "label": "L35", "x": 5, "y": 3 }, - { "label": "R30", "x": 11, "y": 3 }, - { "label": "R31", "x": 12, "y": 3 }, - { "label": "R32", "x": 13, "y": 3 }, - { "label": "R33", "x": 14, "y": 3 }, - { "label": "R34", "x": 15, "y": 3 }, - { "label": "R35", "x": 16, "y": 3 }, - { "label": "L43", "x": 5, "y": 4 }, - { "label": "L44", "x": 6, "y": 4 }, - { "label": "L45", "x": 7, "y": 4 }, - { "label": "R40", "x": 9, "y": 4 }, - { "label": "R41", "x": 10, "y": 4 }, - { "label": "R40", "x": 11, "y": 4 }, - { "label": "L52", "x": 6, "y": 5 }, - { "label": "L53", "x": 7, "y": 5 }, - { "label": "R52", "x": 9, "y": 5 }, - { "label": "R53", "x": 10, "y": 5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 1], "x": 15, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 1], "x": 15, "y": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + {"matrix": [4, 3], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 6, "y": 4}, + {"matrix": [4, 1], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 7, "y": 5}, + {"matrix": [9, 2], "x": 9, "y": 5}, + {"matrix": [9, 5], "x": 10, "y": 5} ] } } diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h deleted file mode 100644 index 5958097880..0000000000 --- a/keyboards/bastardkb/tbk/tbk.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright 2021 Quentin LEBASTARD - * - * 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" - -// clang-format off -#define LAYOUT_split_4x6_5( \ - k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ - k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ - k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ - k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ - k43, k44, k41, k91, k94, k93, \ - k45, k42, k92, k95 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { KC_NO, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { k80, k81, k82, k83, k84, k85 }, \ - { KC_NO, k91, k92, k93, k94, k95 }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index 2056aeeb5d..94c357cd3b 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json @@ -7,48 +7,55 @@ "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "L05", "x": 5, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "R05", "x": 16, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "L15", "x": 5, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "R15", "x": 16, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "L25", "x": 5, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "R25", "x": 16, "y": 2 }, - { "label": "L33", "x": 5, "y": 3 }, - { "label": "L34", "x": 6, "y": 3 }, - { "label": "L31", "x": 7, "y": 3 }, - { "label": "R33", "x": 9, "y": 3 }, - { "label": "R34", "x": 10, "y": 3 }, - { "label": "R31", "x": 11, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [4, 5], "x": 11, "y": 0}, + {"matrix": [4, 4], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0}, + {"matrix": [4, 2], "x": 14, "y": 0}, + {"matrix": [4, 1], "x": 15, "y": 0}, + {"matrix": [4, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [5, 5], "x": 11, "y": 1}, + {"matrix": [5, 4], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1}, + {"matrix": [5, 2], "x": 14, "y": 1}, + {"matrix": [5, 1], "x": 15, "y": 1}, + {"matrix": [5, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [6, 5], "x": 11, "y": 2}, + {"matrix": [6, 4], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2}, + {"matrix": [6, 2], "x": 14, "y": 2}, + {"matrix": [6, 1], "x": 15, "y": 2}, + {"matrix": [6, 0], "x": 16, "y": 2}, + + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 1], "x": 7, "y": 3}, + + {"matrix": [7, 1], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 3], "x": 11, "y": 3} ] } } diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c index 34b42951a0..51baefb737 100644 --- a/keyboards/bastardkb/tbkmini/tbkmini.c +++ b/keyboards/bastardkb/tbkmini/tbkmini.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "tbkmini.h" +#include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/tbkmini/tbkmini.h b/keyboards/bastardkb/tbkmini/tbkmini.h deleted file mode 100644 index f031c9fed2..0000000000 --- a/keyboards/bastardkb/tbkmini/tbkmini.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly DELAY - * - * 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" - -// clang-format off -#define LAYOUT_split_3x6_3( \ - k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ - k33, k34, k31, k71, k74, k73 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { KC_NO, k31, KC_NO, k33, k34, KC_NO }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { KC_NO, k71, KC_NO, k73, k74, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json index 7a0adea313..223aa9b9bc 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/info.json @@ -34,42 +34,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"label":"SW1", "x":0, "y":0.375}, - {"label":"SW2", "x":1, "y":0.125}, - {"label":"SW3", "x":2, "y":0}, - {"label":"SW4", "x":3, "y":0.125}, - {"label":"SW5", "x":4, "y":0.25}, - {"label":"SW19", "x":8, "y":0.25}, - {"label":"SW20", "x":9, "y":0.125}, - {"label":"SW21", "x":10, "y":0}, - {"label":"SW22", "x":11, "y":0.125}, - {"label":"SW23", "x":12, "y":0.375}, - {"label":"SW6", "x":0, "y":1.375}, - {"label":"SW7", "x":1, "y":1.125}, - {"label":"SW8", "x":2, "y":1}, - {"label":"SW9", "x":3, "y":1.125}, - {"label":"SW10", "x":4, "y":1.25}, - {"label":"SW24", "x":8, "y":1.25}, - {"label":"SW25", "x":9, "y":1.125}, - {"label":"SW26", "x":10, "y":1}, - {"label":"SW27", "x":11, "y":1.125}, - {"label":"SW28", "x":12, "y":1.375}, - {"label":"SW11", "x":0, "y":2.375}, - {"label":"SW12", "x":1, "y":2.125}, - {"label":"SW13", "x":2, "y":2}, - {"label":"SW14", "x":3, "y":2.125}, - {"label":"SW15", "x":4, "y":2.25}, - {"label":"SW29", "x":8, "y":2.25}, - {"label":"SW30", "x":9, "y":2.125}, - {"label":"SW31", "x":10, "y":2}, - {"label":"SW32", "x":11, "y":2.125}, - {"label":"SW33", "x":12, "y":2.375}, - {"label":"SW16", "x":2.875, "y":3.25}, - {"label":"SW17", "x":4, "y":3.375}, - {"label":"SW28", "x":5.125, "y":3.625}, - {"label":"SW34", "x":6.875, "y":3.625}, - {"label":"SW35", "x":8, "y":3.375}, - {"label":"SW36", "x":9.125, "y":3.25} + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + + {"matrix": [4, 4], "x": 8, "y": 0.25}, + {"matrix": [4, 3], "x": 9, "y": 0.125}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0.125}, + {"matrix": [4, 0], "x": 12, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + + {"matrix": [5, 4], "x": 8, "y": 1.25}, + {"matrix": [5, 3], "x": 9, "y": 1.125}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1.125}, + {"matrix": [5, 0], "x": 12, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + + {"matrix": [6, 4], "x": 8, "y": 2.25}, + {"matrix": [6, 3], "x": 9, "y": 2.125}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2.125}, + {"matrix": [6, 0], "x": 12, "y": 2.375}, + + {"matrix": [3, 2], "x": 2.875, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3.375}, + {"matrix": [3, 4], "x": 5.125, "y": 3.625}, + + {"matrix": [7, 4], "x": 6.875, "y": 3.625}, + {"matrix": [7, 3], "x": 8, "y": 3.375}, + {"matrix": [7, 2], "x": 9.125, "y": 3.25} ] } } diff --git a/keyboards/bluebell/swoop/swoop.h b/keyboards/bluebell/swoop/swoop.h deleted file mode 100644 index 4160f3af8a..0000000000 --- a/keyboards/bluebell/swoop/swoop.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 James White - * - * 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 - -#define LAYOUT_split_3x5_3( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, L30, L31, L32 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, R32, R31, R30 } \ - } diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h index bf13aa7b00..078cdca07f 100644 --- a/keyboards/centromere/centromere.h +++ b/keyboards/centromere/centromere.h @@ -27,39 +27,3 @@ #define set_led_magenta red_led_on; grn_led_off; blu_led_on #define set_led_cyan red_led_off; grn_led_on; blu_led_on #define set_led_white red_led_on; grn_led_on; blu_led_on - -// For readability -#define ___ 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_split_3x6_3( \ - k0a, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0b, \ - k1a, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b,\ - k2a, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2b,\ - k32, k33, k34, k35, k36, k37 \ -) \ - { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \ - { ___, ___,