From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/arrayperipherals/1x4p1/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/arrayperipherals') diff --git a/keyboards/arrayperipherals/1x4p1/config.h b/keyboards/arrayperipherals/1x4p1/config.h index 5fd99ef30f..719c2c00da 100644 --- a/keyboards/arrayperipherals/1x4p1/config.h +++ b/keyboards/arrayperipherals/1x4p1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 1 -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/arrayperipherals/1x4p1/info.json | 2 ++ keyboards/arrayperipherals/1x4p1/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/arrayperipherals') diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index 6a2e1efd1f..b224d3d5a6 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -8,6 +8,8 @@ "pid": "0x4F46", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_1x5": { "layout": [ diff --git a/keyboards/arrayperipherals/1x4p1/rules.mk b/keyboards/arrayperipherals/1x4p1/rules.mk index 04c446ae15..125977e027 100644 --- a/keyboards/arrayperipherals/1x4p1/rules.mk +++ b/keyboards/arrayperipherals/1x4p1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 18:39:41 +1100 Subject: Migrate `DIRECT_PINS` to data driven (#19826) --- keyboards/arrayperipherals/1x4p1/config.h | 10 ---------- keyboards/arrayperipherals/1x4p1/info.json | 5 +++++ 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'keyboards/arrayperipherals') diff --git a/keyboards/arrayperipherals/1x4p1/config.h b/keyboards/arrayperipherals/1x4p1/config.h index 719c2c00da..b70680e4f5 100644 --- a/keyboards/arrayperipherals/1x4p1/config.h +++ b/keyboards/arrayperipherals/1x4p1/config.h @@ -17,16 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 5 - - -#define DIRECT_PINS { \ - { C7, B7, D6, F5, F7} \ -} - /* rotary encoder*/ #define ENCODERS_PAD_A {F0} #define ENCODERS_PAD_B {F1} diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index b224d3d5a6..0441646af0 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["C7", "B7", "D6", "F5", "F7"] + ] + }, "layouts": { "LAYOUT_ortho_1x5": { "layout": [ -- cgit v1.2.3 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/arrayperipherals/1x4p1/1x4p1.c | 18 ------------------ keyboards/arrayperipherals/1x4p1/1x4p1.h | 26 -------------------------- keyboards/arrayperipherals/1x4p1/info.json | 10 +++++----- 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 keyboards/arrayperipherals/1x4p1/1x4p1.c delete mode 100644 keyboards/arrayperipherals/1x4p1/1x4p1.h (limited to 'keyboards/arrayperipherals') diff --git a/keyboards/arrayperipherals/1x4p1/1x4p1.c b/keyboards/arrayperipherals/1x4p1/1x4p1.c deleted file mode 100644 index 788ccff553..0000000000 --- a/keyboards/arrayperipherals/1x4p1/1x4p1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 David Doan - -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 "1x4p1.h" diff --git a/keyboards/arrayperipherals/1x4p1/1x4p1.h b/keyboards/arrayperipherals/1x4p1/1x4p1.h deleted file mode 100644 index 8f385a9086..0000000000 --- a/keyboards/arrayperipherals/1x4p1/1x4p1.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 David Doan - -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_1x5( \ - k01, k02, k03, k04, k05\ - ) { \ - { k01, k02, k03, k04, k05} \ -} diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index 0441646af0..b124b20334 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -18,11 +18,11 @@ "layouts": { "LAYOUT_ortho_1x5": { "layout": [ - {"label": "K01", "x":0, "y":0}, - {"label": "K02", "x":1, "y":0}, - {"label": "K03", "x":2, "y":0}, - {"label": "K04", "x":3, "y":0}, - {"label": "K05", "x":4, "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]}, + {"x":4, "y":0, "matrix": [0, 4]} ] } } -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/arrayperipherals/1x4p1/config.h | 22 ---------------------- keyboards/arrayperipherals/1x4p1/info.json | 5 +++++ 2 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 keyboards/arrayperipherals/1x4p1/config.h (limited to 'keyboards/arrayperipherals') diff --git a/keyboards/arrayperipherals/1x4p1/config.h b/keyboards/arrayperipherals/1x4p1/config.h deleted file mode 100644 index b70680e4f5..0000000000 --- a/keyboards/arrayperipherals/1x4p1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 David Doan - -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 - -/* rotary encoder*/ -#define ENCODERS_PAD_A {F0} -#define ENCODERS_PAD_B {F1} diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json index b124b20334..2cc838bc92 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/info.json @@ -8,6 +8,11 @@ "pid": "0x4F46", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "F0", "pin_b": "F1"} + ] + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { -- cgit v1.2.3