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/aplyard/aplx6/rev1/config.h | 1 - keyboards/aplyard/aplx6/rev2/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h index 660ec9661f..46e7d3668f 100644 --- a/keyboards/aplyard/aplx6/rev1/config.h +++ b/keyboards/aplyard/aplx6/rev1/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 2 diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h index 922ab5f44a..649e72e847 100644 --- a/keyboards/aplyard/aplx6/rev2/config.h +++ b/keyboards/aplyard/aplx6/rev2/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 2 -- 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/aplyard/aplx6/rev1/info.json | 4 +++- keyboards/aplyard/aplx6/rev1/rules.mk | 6 ------ keyboards/aplyard/aplx6/rev2/info.json | 4 +++- keyboards/aplyard/aplx6/rev2/rules.mk | 6 ------ 4 files changed, 6 insertions(+), 14 deletions(-) (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json index 3eb12dda15..6a1ac3071b 100644 --- a/keyboards/aplyard/aplx6/rev1/info.json +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x0030", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/aplyard/aplx6/rev1/rules.mk b/keyboards/aplyard/aplx6/rev1/rules.mk index 2f485606c2..879e2c47a3 100644 --- a/keyboards/aplyard/aplx6/rev1/rules.mk +++ b/keyboards/aplyard/aplx6/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json index 06fc50187a..314d52dc8d 100644 --- a/keyboards/aplyard/aplx6/rev2/info.json +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x0040", "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/aplyard/aplx6/rev2/rules.mk b/keyboards/aplyard/aplx6/rev2/rules.mk index 22ada747ff..90decf0341 100644 --- a/keyboards/aplyard/aplx6/rev2/rules.mk +++ b/keyboards/aplyard/aplx6/rev2/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 7fad94ba2d5092abe451d0bbc95caaa37fec95bc Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:13:41 +1100 Subject: Remove unused RGBLight defines from config.h (#19859) --- keyboards/aplyard/aplx6/rev1/config.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h index 46e7d3668f..8a32a8ae37 100644 --- a/keyboards/aplyard/aplx6/rev1/config.h +++ b/keyboards/aplyard/aplx6/rev1/config.h @@ -26,12 +26,5 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { E6, B3 } #define MATRIX_COL_PINS { F7, B6, F4 } - -/* ws2812 RGB LED */ -//#define RGB_DI_PIN X - -//#define RGBLED_NUM X // Number of LEDs - - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/aplyard/aplx6/rev1/config.h | 4 ---- keyboards/aplyard/aplx6/rev2/config.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h index 8a32a8ae37..cd4a58eec5 100644 --- a/keyboards/aplyard/aplx6/rev1/config.h +++ b/keyboards/aplyard/aplx6/rev1/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - /* pin-out */ #define MATRIX_ROW_PINS { E6, B3 } #define MATRIX_COL_PINS { F7, B6, F4 } diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h index 649e72e847..1e109c7001 100644 --- a/keyboards/aplyard/aplx6/rev2/config.h +++ b/keyboards/aplyard/aplx6/rev2/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - /* 9Key PCB default pin-out */ #define MATRIX_ROW_PINS { B4, B5 } #define MATRIX_COL_PINS { C6, D7, E6 } -- 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/aplyard/aplx6/rev2/config.h | 5 ----- keyboards/aplyard/aplx6/rev2/info.json | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboards/aplyard/aplx6') diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h index 1e109c7001..f2793935cb 100644 --- a/keyboards/aplyard/aplx6/rev2/config.h +++ b/keyboards/aplyard/aplx6/rev2/config.h @@ -27,9 +27,4 @@ along with this program. If not, see . #define TAPPING_TERM 200 -/* Encoder */ -#define ENCODERS_PAD_A { F5 } -#define ENCODERS_PAD_B { F4 } -#define ENCODER_RESOLUTION 4 - #define TAP_CODE_DELAY 50 diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json index 314d52dc8d..114894a714 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" }, + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4"} + ] + }, "processor": "atmega32u4", "bootloader": "caterina" } -- cgit v1.2.3