From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/aplyard/aplx6/rev1/config.h | 26 -------------------------- keyboards/aplyard/aplx6/rev1/info.json | 5 +++++ keyboards/aplyard/aplx6/rev2/config.h | 8 -------- keyboards/aplyard/aplx6/rev2/info.json | 5 +++++ 4 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 keyboards/aplyard/aplx6/rev1/config.h (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h deleted file mode 100644 index cd4a58eec5..0000000000 --- a/keyboards/aplyard/aplx6/rev1/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 April Aplyard - -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 - - -/* pin-out */ -#define MATRIX_ROW_PINS { E6, B3 } -#define MATRIX_COL_PINS { F7, B6, F4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json index 6a1ac3071b..167699150f 100644 --- a/keyboards/aplyard/aplx6/rev1/info.json +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B6", "F4"], + "rows": ["E6", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h index f2793935cb..2724ccf117 100644 --- a/keyboards/aplyard/aplx6/rev2/config.h +++ b/keyboards/aplyard/aplx6/rev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* 9Key PCB default pin-out */ -#define MATRIX_ROW_PINS { B4, B5 } -#define MATRIX_COL_PINS { C6, D7, E6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 200 #define TAP_CODE_DELAY 50 diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json index 114894a714..726dab814c 100644 --- a/keyboards/aplyard/aplx6/rev2/info.json +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -3,6 +3,11 @@ "pid": "0x0040", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6"], + "rows": ["B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} -- 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/aplyard/aplx6/rev1/rev1.c | 19 ------------------- keyboards/aplyard/aplx6/rev2/rev2.c | 16 ---------------- 2 files changed, 35 deletions(-) delete mode 100644 keyboards/aplyard/aplx6/rev1/rev1.c delete mode 100644 keyboards/aplyard/aplx6/rev2/rev2.c (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/rev1/rev1.c b/keyboards/aplyard/aplx6/rev1/rev1.c deleted file mode 100644 index 7f6f8a3224..0000000000 --- a/keyboards/aplyard/aplx6/rev1/rev1.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 April Aplyard - -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 "rev1.h" - diff --git a/keyboards/aplyard/aplx6/rev2/rev2.c b/keyboards/aplyard/aplx6/rev2/rev2.c deleted file mode 100644 index 1a97f50058..0000000000 --- a/keyboards/aplyard/aplx6/rev2/rev2.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2020 Aplyard - * - * 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 "rev2.h" -- cgit v1.2.3 From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/aplyard/aplx6/info.json | 13 ------------- keyboards/aplyard/aplx6/rev1/info.json | 15 ++++++++++++++- keyboards/aplyard/aplx6/rev1/rev1.h | 12 ------------ keyboards/aplyard/aplx6/rev2/info.json | 15 ++++++++++++++- keyboards/aplyard/aplx6/rev2/rev2.h | 28 ---------------------------- 5 files changed, 28 insertions(+), 55 deletions(-) delete mode 100644 keyboards/aplyard/aplx6/rev1/rev1.h delete mode 100644 keyboards/aplyard/aplx6/rev2/rev2.h (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json index 0bd317c1a4..9f86182a33 100644 --- a/keyboards/aplyard/aplx6/info.json +++ b/keyboards/aplyard/aplx6/info.json @@ -5,18 +5,5 @@ "maintainer": "Aplyard", "usb": { "vid": "0xE0E0" - }, - "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} - ] - } } } diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json index 167699150f..943624fb8f 100644 --- a/keyboards/aplyard/aplx6/rev1/info.json +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -9,5 +9,18 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} + ] + } + } } diff --git a/keyboards/aplyard/aplx6/rev1/rev1.h b/keyboards/aplyard/aplx6/rev1/rev1.h deleted file mode 100644 index 6990d388e7..0000000000 --- a/keyboards/aplyard/aplx6/rev1/rev1.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "quantum.h" - -#define LAYOUT( \ - k000, k001, k002, \ - k100, k101, k102 \ -) \ -{ \ - { k000, k001, k002 }, \ - { k100, k101, k102 } \ -} - diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json index 726dab814c..2dc54180eb 100644 --- a/keyboards/aplyard/aplx6/rev2/info.json +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -14,5 +14,18 @@ ] }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} + ] + } + } } diff --git a/keyboards/aplyard/aplx6/rev2/rev2.h b/keyboards/aplyard/aplx6/rev2/rev2.h deleted file mode 100644 index 193c6cd51c..0000000000 --- a/keyboards/aplyard/aplx6/rev2/rev2.h +++ /dev/null @@ -1,28 +0,0 @@ - /* Copyright 2020 Aplyard - * - * 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( \ - k000, k001, k002, \ - k100, k101, k102 \ -) \ -{ \ - { k000, k001, k002 }, \ - { k100, k101, k102 } \ -} - - -- cgit v1.2.3