From 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:32:05 +1100 Subject: Move matrix config to info.json, part 6 (#20019) --- keyboards/handwired/riblee_f401/config.h | 6 ------ keyboards/handwired/riblee_f401/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/handwired/riblee_f401') diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h index 2cee851436..09a304e1c7 100644 --- a/keyboards/handwired/riblee_f401/config.h +++ b/keyboards/handwired/riblee_f401/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 } -#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B6, B7, B8, B9 } - -#define DIODE_DIRECTION COL2ROW - #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175 \ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index 94cc2c35f2..60cfdb9d3b 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -8,6 +8,11 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], + "rows": ["A6", "A5", "A4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pin": "A0", -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/handwired/riblee_f401/riblee_f401.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/handwired/riblee_f401/riblee_f401.c (limited to 'keyboards/handwired/riblee_f401') diff --git a/keyboards/handwired/riblee_f401/riblee_f401.c b/keyboards/handwired/riblee_f401/riblee_f401.c deleted file mode 100644 index 65155b373c..0000000000 --- a/keyboards/handwired/riblee_f401/riblee_f401.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Daniel Reibl - * - * 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 "riblee_f401.h" \ No newline at end of file -- cgit v1.2.3 From 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Mar 2023 15:54:34 +1100 Subject: Move ortho & numpad layouts to data driven (#20183) Co-authored-by: Nick Brassel --- keyboards/handwired/riblee_f401/info.json | 120 +++++++++++++------------- keyboards/handwired/riblee_f401/riblee_f401.h | 34 -------- 2 files changed, 60 insertions(+), 94 deletions(-) delete mode 100644 keyboards/handwired/riblee_f401/riblee_f401.h (limited to 'keyboards/handwired/riblee_f401') diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index 60cfdb9d3b..7b9b320b98 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -25,70 +25,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0}, - {"x": 2,"y": 0}, - {"x": 3,"y": 0}, - {"x": 4,"y": 0}, - {"x": 5,"y": 0}, - {"x": 6,"y": 0}, - {"x": 7,"y": 0}, - {"x": 8,"y": 0}, - {"x": 9,"y": 0}, - {"x": 10,"y": 0}, - {"x": 11,"y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"x": 0,"y": 1}, - {"x": 1,"y": 1}, - {"x": 2,"y": 1}, - {"x": 3,"y": 1}, - {"x": 4,"y": 1}, - {"x": 5,"y": 1}, - {"x": 6,"y": 1}, - {"x": 7,"y": 1}, - {"x": 8,"y": 1}, - {"x": 9,"y": 1}, - {"x": 10,"y": 1}, - {"x": 11,"y": 1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x": 0,"y": 2}, - {"x": 1,"y": 2}, - {"x": 2,"y": 2}, - {"x": 3,"y": 2}, - {"x": 4,"y": 2}, - {"x": 5,"y": 2}, - {"x": 6,"y": 2}, - {"x": 7,"y": 2}, - {"x": 8,"y": 2}, - {"x": 9,"y": 2}, - {"x": 10,"y": 2}, - {"x": 11,"y": 2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x": 0,"y": 3}, - {"x": 1,"y": 3}, - {"x": 2,"y": 3}, - {"x": 3,"y": 3}, - {"x": 4,"y": 3}, - {"x": 5,"y": 3}, - {"x": 6,"y": 3}, - {"x": 7,"y": 3}, - {"x": 8,"y": 3}, - {"x": 9,"y": 3}, - {"x": 10,"y": 3}, - {"x": 11,"y": 3}, + {"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": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, - {"x": 0,"y": 4}, - {"x": 1,"y": 4}, - {"x": 2,"y": 4}, - {"x": 3,"y": 4}, - {"x": 4,"y": 4}, - {"x": 5,"y": 4}, - {"x": 6,"y": 4}, - {"x": 7,"y": 4}, - {"x": 8,"y": 4}, - {"x": 9,"y": 4}, - {"x": 10,"y": 4}, - {"x": 11,"y": 4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/riblee_f401/riblee_f401.h b/keyboards/handwired/riblee_f401/riblee_f401.h deleted file mode 100644 index a1b326aae4..0000000000 --- a/keyboards/handwired/riblee_f401/riblee_f401.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 QMK Community, Janos Daniel Reibl @riblee - -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_5x12( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ -} -- cgit v1.2.3