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/25keys/cassette42/cassette42.c | 16 --------------- keyboards/25keys/cassette42/cassette42.h | 34 -------------------------------- keyboards/25keys/cassette42/info.json | 9 ++++++++- 3 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 keyboards/25keys/cassette42/cassette42.c delete mode 100644 keyboards/25keys/cassette42/cassette42.h (limited to 'keyboards/25keys') 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]} + ] } } } -- cgit v1.2.3