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/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 ---------- 19 files changed, 70 insertions(+), 284 deletions(-) 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 (limited to 'keyboards/keebio') diff --git a/keyboards/keebio/bamfk1/bamfk1.c b/keyboards/keebio/bamfk1/bamfk1.c deleted file mode 100644 index eddd7e624e..0000000000 --- a/keyboards/keebio/bamfk1/bamfk1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "bamfk1.h" diff --git a/keyboards/keebio/bamfk1/bamfk1.h b/keyboards/keebio/bamfk1/bamfk1.h deleted file mode 100644 index be1fd00808..0000000000 --- a/keyboards/keebio/bamfk1/bamfk1.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2021 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, e01, e02, \ - e01a, e01b, e02a, e02b \ -) { \ - { k00, e01, e02, KC_NO }, \ - { e01a, e01b, e02a, e02b } \ -} diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index 9390f7d56f..c39cbd3ce0 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -19,14 +19,14 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 1.5, "y": 0, "h":2, "w": 2}, - {"label": "k01", "x": 0.5, "y": 2.25}, - {"label": "k02", "x": 3.5, "y": 2.25}, + {"x": 1.5, "y": 0, "h":2, "w": 2, "matrix": [0, 0]}, + {"x": 0.5, "y": 2.25, "matrix": [0, 1]}, + {"x": 3.5, "y": 2.25, "matrix": [0, 2]}, - {"label": "k10", "x": 0, "y": 3.5}, - {"label": "k11", "x": 1, "y": 3.5}, - {"label": "k12", "x": 3, "y": 3.5}, - {"label": "k13", "x": 4, "y": 3.5} + {"x": 0, "y": 3.5, "matrix": [1, 0]}, + {"x": 1, "y": 3.5, "matrix": [1, 1]}, + {"x": 3, "y": 3.5, "matrix": [1, 2]}, + {"x": 4, "y": 3.5, "matrix": [1, 3]} ] } } diff --git a/keyboards/keebio/bdn9/bdn9.c b/keyboards/keebio/bdn9/bdn9.c deleted file mode 100644 index 0ff55fd6d4..0000000000 --- a/keyboards/keebio/bdn9/bdn9.c +++ /dev/null @@ -1 +0,0 @@ -#include "bdn9.h" diff --git a/keyboards/keebio/bdn9/bdn9.h b/keyboards/keebio/bdn9/bdn9.h deleted file mode 100644 index 94ba78a6ad..0000000000 --- a/keyboards/keebio/bdn9/bdn9.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_keebio_bdn9_rev1 - #include "rev1.h" -#elif KEYBOARD_keebio_bdn9_rev2 - #include "rev2.h" -#endif diff --git a/keyboards/keebio/bdn9/info.json b/keyboards/keebio/bdn9/info.json index 4bb378ea7a..19a0241234 100644 --- a/keyboards/keebio/bdn9/info.json +++ b/keyboards/keebio/bdn9/info.json @@ -8,15 +8,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/keebio/bdn9/rev1/rev1.c b/keyboards/keebio/bdn9/rev1/rev1.c index f064ca51df..567de03af4 100644 --- a/keyboards/keebio/bdn9/rev1/rev1.c +++ b/keyboards/keebio/bdn9/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/bdn9/rev1/rev1.h b/keyboards/keebio/bdn9/rev1/rev1.h deleted file mode 100644 index 9e04032d81..0000000000 --- a/keyboards/keebio/bdn9/rev1/rev1.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Danny Nguyen - * - * 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 "bdn9.h" -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - KA1, KA2, KA3, \ - KB1, KB2, KB3, \ - KC1, KC2, KC3 \ -) \ -{ \ - { KA1, KA2, KA3 }, \ - { KB1, KB2, KB3 }, \ - { KC1, KC2, KC3 } \ -} diff --git a/keyboards/keebio/bdn9/rev2/rev2.c b/keyboards/keebio/bdn9/rev2/rev2.c index 14b556823f..5c6d940325 100644 --- a/keyboards/keebio/bdn9/rev2/rev2.c +++ b/keyboards/keebio/bdn9/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "rev2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/bdn9/rev2/rev2.h b/keyboards/keebio/bdn9/rev2/rev2.h deleted file mode 100644 index 0f0603c1d6..0000000000 --- a/keyboards/keebio/bdn9/rev2/rev2.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Danny Nguyen - * - * 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 "bdn9.h" -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - KA1, KA2, KA3, \ - KB1, KB2, KB3, \ - KC1, KC2, KC3 \ -) \ -{ \ - { KA1, KA2, KA3 }, \ - { KB1, KB2, KB3 }, \ - { KC1, KC2, KC3 } \ -} diff --git a/keyboards/keebio/choconum/choconum.c b/keyboards/keebio/choconum/choconum.c deleted file mode 100644 index 5360a716d7..0000000000 --- a/keyboards/keebio/choconum/choconum.c +++ /dev/null @@ -1 +0,0 @@ -#include "choconum.h" diff --git a/keyboards/keebio/choconum/choconum.h b/keyboards/keebio/choconum/choconum.h deleted file mode 100644 index e77c5886ec..0000000000 --- a/keyboards/keebio/choconum/choconum.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 Keebio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x4( \ - KA1, KA2, KA3, KA4, \ - KB1, KB2, KB3, KB4, \ - KC1, KC2, KC3, KC4, \ - KD1, KD2, KD3, KD4, \ - KE1, KE2, KE3, KE4 \ -) \ -{ \ - { KA1, KA2, KA3, KA4 }, \ - { KB1, KB2, KB3, KB4 }, \ - { KC1, KC2, KC3, KC4 }, \ - { KD1, KD2, KD3, KD4 }, \ - { KE1, KE2, KE3, KE4 } \ -} - -#define LAYOUT_numpad_5x4( \ - KA1, KA2, KA3, KA4, \ - KB1, KB2, KB3, KB4, \ - KC1, KC2, KC3, \ - KD1, KD2, KD3, KD4, \ - KE1, KE3 \ -) \ -{ \ - { KA1, KA2, KA3, KA4 }, \ - { KB1, KB2, KB3, KB4 }, \ - { KC1, KC2, KC3, KC_NO }, \ - { KD1, KD2, KD3, KD4 }, \ - { KE1, KC_NO, KE3, KC_NO } \ -} diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json index b373df4850..856549eb96 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/info.json @@ -23,55 +23,55 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1, "h":2}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "h":2, "matrix": [1, 3]}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3, "h":2}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "h":2, "matrix": [3, 3]}, - {"x":0, "y":4,"w":2}, - {"x":2, "y":4} + {"x":0, "y":4,"w":2, "matrix": [4, 0]}, + {"x":2, "y":4, "matrix": [4, 2]} ] }, "LAYOUT_ortho_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, + {"x":3, "y":2, "matrix": [2, 3]}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "matrix": [3, 3]}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} + {"x":0, "y":4, "matrix": [4, 0]}, + {"x":1, "y":4, "matrix": [4, 1]}, + {"x":2, "y":4, "matrix": [4, 2]}, + {"x":3, "y":4, "matrix": [4, 3]} ] } } diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json index ff91ee9f24..268e56032d 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/info.json @@ -18,18 +18,18 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "F1", "x": 0, "y": 0 }, - { "label": "F2", "x": 1, "y": 0 }, - { "label": "F3", "x": 2, "y": 0 }, - { "label": "F4", "x": 3, "y": 0 }, - { "label": "F5", "x": 4, "y": 0 }, - { "label": "F6", "x": 5, "y": 0 }, - { "label": "F7", "x": 6, "y": 0 }, - { "label": "F8", "x": 7, "y": 0 }, - { "label": "F9", "x": 8, "y": 0 }, - { "label": "F10", "x": 9, "y": 0 }, - { "label": "F11", "x": 10, "y": 0 }, - { "label": "F12", "x": 11, "y": 0 } + { "x": 0, "y": 0, "matrix": [0, 0] }, + { "x": 1, "y": 0, "matrix": [0, 1] }, + { "x": 2, "y": 0, "matrix": [0, 2] }, + { "x": 3, "y": 0, "matrix": [0, 3] }, + { "x": 4, "y": 0, "matrix": [0, 4] }, + { "x": 5, "y": 0, "matrix": [0, 5] }, + { "x": 6, "y": 0, "matrix": [0, 6] }, + { "x": 7, "y": 0, "matrix": [0, 7] }, + { "x": 8, "y": 0, "matrix": [0, 8] }, + { "x": 9, "y": 0, "matrix": [0, 9] }, + { "x": 10, "y": 0, "matrix": [0, 10] }, + { "x": 11, "y": 0, "matrix": [0, 11] } ] } } diff --git a/keyboards/keebio/stick/stick.c b/keyboards/keebio/stick/stick.c index 8db839de3b..6fac145091 100644 --- a/keyboards/keebio/stick/stick.c +++ b/keyboards/keebio/stick/stick.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "stick.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/stick/stick.h b/keyboards/keebio/stick/stick.h deleted file mode 100644 index 758d7d5b97..0000000000 --- a/keyboards/keebio/stick/stick.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2021 Danny Nguyen - -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( \ - A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12 \ - ) { \ - {A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12} \ - } diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json index 2be3e55e70..3f34d8e604 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/info.json @@ -18,8 +18,8 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]} ] } } diff --git a/keyboards/keebio/tukey/tukey.c b/keyboards/keebio/tukey/tukey.c deleted file mode 100644 index a4582370e4..0000000000 --- a/keyboards/keebio/tukey/tukey.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Keebio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "tukey.h" diff --git a/keyboards/keebio/tukey/tukey.h b/keyboards/keebio/tukey/tukey.h deleted file mode 100644 index b8e40bb04d..0000000000 --- a/keyboards/keebio/tukey/tukey.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2019 Keebio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT(k00, k01) { {k00, k01} } -- cgit v1.2.3