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/botanicalkeyboards/fm2u/fm2u.c | 17 ----- keyboards/botanicalkeyboards/fm2u/fm2u.h | 113 ---------------------------- keyboards/botanicalkeyboards/fm2u/info.json | 38 +++++++--- 3 files changed, 26 insertions(+), 142 deletions(-) delete mode 100644 keyboards/botanicalkeyboards/fm2u/fm2u.c delete mode 100644 keyboards/botanicalkeyboards/fm2u/fm2u.h (limited to 'keyboards/botanicalkeyboards/fm2u') 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_isoenter( \ - k00 \ -) { \ - { k00 } \ -} - -// Backward compatibility TODO: remove these -#define LAYOUT_100u LAYOUT_1u -#define LAYOUT_125u LAYOUT_1u25 -#define LAYOUT_150u LAYOUT_1u5 -#define LAYOUT_175u LAYOUT_1u75 -#define LAYOUT_200u LAYOUT_2u -#define LAYOUT_225u LAYOUT_2u25 -#define LAYOUT_275u LAYOUT_2u75 -#define LAYOUT_300u LAYOUT_3u -#define LAYOUT_600u LAYOUT_6u -#define LAYOUT_625u LAYOUT_6u25 -#define LAYOUT_700u LAYOUT_7u -#define LAYOUT_iso LAYOUT_isoenter diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/info.json index 09d617152b..0d4dd1e88b 100644 --- a/keyboards/botanicalkeyboards/fm2u/info.json +++ b/keyboards/botanicalkeyboards/fm2u/info.json @@ -15,65 +15,79 @@ ["C4"] ] }, + "layout_aliases": { + "LAYOUT_100u": "LAYOUT_1u", + "LAYOUT_125u": "LAYOUT_1u25", + "LAYOUT_150u": "LAYOUT_1u5", + "LAYOUT_175u": "LAYOUT_1u75", + "LAYOUT_200u": "LAYOUT_2u", + "LAYOUT_225u": "LAYOUT_2u25", + "LAYOUT_275u": "LAYOUT_2u75", + "LAYOUT_300u": "LAYOUT_3u", + "LAYOUT_600u": "LAYOUT_6u", + "LAYOUT_625u": "LAYOUT_6u25", + "LAYOUT_700u": "LAYOUT_7u", + "LAYOUT_iso": "LAYOUT_isoenter" + }, "layouts": { "LAYOUT_1u": { "layout": [ - {"x": 0, "y": 0} + {"x": 0, "y": 0, "matrix": [0, 0]} ] }, "LAYOUT_1u25": { "layout": [ - {"x": 0, "y": 0, "w": 1.25} + {"x": 0, "y": 0, "w": 1.25, "matrix": [0, 0]} ] }, "LAYOUT_1u5": { "layout": [ - {"x": 0, "y": 0, "w": 1.50} + {"x": 0, "y": 0, "w": 1.50, "matrix": [0, 0]} ] }, "LAYOUT_1u75": { "layout": [ - {"x": 0, "y": 0, "w": 1.75} + {"x": 0, "y": 0, "w": 1.75, "matrix": [0, 0]} ] }, "LAYOUT_2u": { "layout": [ - {"x": 0, "y": 0, "w": 2} + {"x": 0, "y": 0, "w": 2, "matrix": [0, 0]} ] }, "LAYOUT_2u25": { "layout": [ - {"x": 0, "y": 0, "w": 2.25} + {"x": 0, "y": 0, "w": 2.25, "matrix": [0, 0]} ] }, "LAYOUT_2u75": { "layout": [ - {"x": 0, "y": 0, "w": 2.75} + {"x": 0, "y": 0, "w": 2.75, "matrix": [0, 0]} ] }, "LAYOUT_3u": { "layout": [ - {"x": 0, "y": 0, "w": 3} + {"x": 0, "y": 0, "w": 3, "matrix": [0, 0]} ] }, "LAYOUT_6u": { "layout": [ - {"x": 0, "y": 0, "w": 6} + {"x": 0, "y": 0, "w": 6, "matrix": [0, 0]} ] }, "LAYOUT_6u25": { "layout": [ - {"x": 0, "y": 0, "w": 6.25} + {"x": 0, "y": 0, "w": 6.25, "matrix": [0, 0]} ] }, "LAYOUT_7u": { "layout": [ - {"x": 0, "y": 0, "w": 7} + {"x": 0, "y": 0, "w": 7, "matrix": [0, 0]} ] }, "LAYOUT_isoenter": { "layout": [ - {"x": 0.25, "y": 0, "w": 1.25, "h": 2} + {"x": 0.25, "y": 0, "w": 1.25, "h": 2, "matrix": [0, 0]} ] } } -- cgit v1.2.3