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/4pplet/aekiso60/rev_a/config.h | 1 - keyboards/4pplet/aekiso60/rev_b/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 8a8c990202..7220a06e80 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 0278c9b2b9..574421972f 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 7220a06e80..2fb0079f45 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -11,9 +11,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/aekiso60/rev_b/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 2fb0079f45..aaac4f6b70 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -11,9 +11,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT C2 // usually ROW diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 574421972f..0828658de4 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT A3 // usually COL #define QMK_ESC_INPUT B14 // usually ROW -- 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/4pplet/aekiso60/rev_a/info.json | 2 ++ keyboards/4pplet/aekiso60/rev_a/rules.mk | 6 ------ keyboards/4pplet/aekiso60/rev_b/info.json | 2 ++ keyboards/4pplet/aekiso60/rev_b/rules.mk | 6 ------ 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index f838933c08..e43265fcdd 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/aekiso60/rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk index 43eb792fc1..6fe874e748 100644 --- a/keyboards/4pplet/aekiso60/rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index 948c6f6515..ecaa326e51 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/aekiso60/rev_b/rules.mk b/keyboards/4pplet/aekiso60/rev_b/rules.mk index 8dc60fa527..041df45eca 100644 --- a/keyboards/4pplet/aekiso60/rev_b/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/4pplet/aekiso60/rev_b/config.h | 2 -- keyboards/4pplet/aekiso60/rev_b/info.json | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 0828658de4..f6e636c526 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -48,6 +48,4 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define LED_CAPS_LOCK_PIN A10 - #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index ecaa326e51..fe2e424999 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,9 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "A10" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { -- 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/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/aekiso60/rev_b/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index aaac4f6b70..d9f0e2e63c 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -1,9 +1,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {C2,D0,B0,C7,C5} #define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1} diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index f6e636c526..e3800ad576 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {B15,A9,B7,A1,A2} -- cgit v1.2.3 From 26854f59402f3f4b7ca5cfe0f3dd665a680715f5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Feb 2023 12:12:42 +1100 Subject: Remove default and unused `BACKLIGHT_LEVELS` (#19898) --- keyboards/4pplet/aekiso60/rev_a/config.h | 1 - keyboards/4pplet/aekiso60/rev_b/config.h | 2 -- 2 files changed, 3 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index d9f0e2e63c..da29046991 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -13,7 +13,6 @@ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 -#define BACKLIGHT_LEVELS 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index e3800ad576..1162b4acd1 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -44,5 +44,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_LEVELS 5 -- cgit v1.2.3 From 3bf01bb9ed202b14f78105db2aa2a75d01fc4323 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Feb 2023 09:20:23 +1100 Subject: Move QMK LUFA bootloader config to data driven (#19879) --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/aekiso60/rev_a/info.json | 4 ++++ keyboards/4pplet/aekiso60/rev_b/config.h | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'keyboards/4pplet/aekiso60') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index da29046991..f7ef22d986 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -8,9 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT C2 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index e43265fcdd..9932b6ec55 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C2", + "esc_output": "C4" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 1162b4acd1..b5602b1cc0 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT A3 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW - #define RGBLED_NUM 12 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 -- cgit v1.2.3