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/dailycraft/stickey4/info.json | 16 +++++++------- keyboards/dailycraft/stickey4/stickey4.c | 17 --------------- keyboards/dailycraft/stickey4/stickey4.h | 36 -------------------------------- 3 files changed, 8 insertions(+), 61 deletions(-) delete mode 100644 keyboards/dailycraft/stickey4/stickey4.c delete mode 100644 keyboards/dailycraft/stickey4/stickey4.h (limited to 'keyboards/dailycraft/stickey4') diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json index 95d3539456..69dc1479a4 100644 --- a/keyboards/dailycraft/stickey4/info.json +++ b/keyboards/dailycraft/stickey4/info.json @@ -18,15 +18,15 @@ "layouts": { "LAYOUT": { "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]}, - {"label": "Encoder 1 CCW", "x": 0, "y": 1}, - {"label": "Encoder 1 CW", "x": 1, "y": 1}, - {"label": "Encoder 2 CCW", "x": 2, "y": 1}, - {"label": "Encoder 2 CW", "x": 3, "y": 1} + {"label": "Encoder 1 CCW", "x": 0, "y": 1, "matrix": [0, 4]}, + {"label": "Encoder 1 CW", "x": 1, "y": 1, "matrix": [0, 5]}, + {"label": "Encoder 2 CCW", "x": 2, "y": 1, "matrix": [0, 6]}, + {"label": "Encoder 2 CW", "x": 3, "y": 1, "matrix": [0, 7]} ] } } diff --git a/keyboards/dailycraft/stickey4/stickey4.c b/keyboards/dailycraft/stickey4/stickey4.c deleted file mode 100644 index dd0ac4f5f2..0000000000 --- a/keyboards/dailycraft/stickey4/stickey4.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "stickey4.h" diff --git a/keyboards/dailycraft/stickey4/stickey4.h b/keyboards/dailycraft/stickey4/stickey4.h deleted file mode 100644 index 6a21a8f991..0000000000 --- a/keyboards/dailycraft/stickey4/stickey4.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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( \ - k00, k01, k02, k03, \ - k04, k05, k06, k07 \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07 } \ -} -- cgit v1.2.3