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/keychron/q9/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/keychron/q9') diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h index 33160b618e..b63211102f 100644 --- a/keyboards/keychron/q9/config.h +++ b/keyboards/keychron/q9/config.h @@ -29,9 +29,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Disable DIP switch in matrix data */ #define MATRIX_MASKED -- 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/keychron/q9/ansi/info.json | 2 ++ keyboards/keychron/q9/ansi/rules.mk | 6 ------ keyboards/keychron/q9/ansi_encoder/info.json | 2 ++ keyboards/keychron/q9/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/q9/iso/info.json | 2 ++ keyboards/keychron/q9/iso/rules.mk | 6 ------ keyboards/keychron/q9/iso_encoder/info.json | 2 ++ keyboards/keychron/q9/iso_encoder/rules.mk | 6 ------ 8 files changed, 8 insertions(+), 24 deletions(-) (limited to 'keyboards/keychron/q9') diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json index a09aefa068..e1a6ae534d 100644 --- a/keyboards/keychron/q9/ansi/info.json +++ b/keyboards/keychron/q9/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0190", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_52": { "layout": [ diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk index f5327cf417..345807d824 100644 --- a/keyboards/keychron/q9/ansi/rules.mk +++ b/keyboards/keychron/q9/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json index b305f49f24..54719d5749 100644 --- a/keyboards/keychron/q9/ansi_encoder/info.json +++ b/keyboards/keychron/q9/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0191", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_52": { "layout": [ diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk index 0b77b0ec7b..37010e0d59 100644 --- a/keyboards/keychron/q9/ansi_encoder/rules.mk +++ b/keyboards/keychron/q9/ansi_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json index c1238d5c7e..159abc63ae 100644 --- a/keyboards/keychron/q9/iso/info.json +++ b/keyboards/keychron/q9/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0192", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_53": { "layout": [ diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk index f5327cf417..345807d824 100644 --- a/keyboards/keychron/q9/iso/rules.mk +++ b/keyboards/keychron/q9/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json index a0a80a33fb..4e4819519d 100644 --- a/keyboards/keychron/q9/iso_encoder/info.json +++ b/keyboards/keychron/q9/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0193", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_53": { "layout": [ diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk index 0b77b0ec7b..37010e0d59 100644 --- a/keyboards/keychron/q9/iso_encoder/rules.mk +++ b/keyboards/keychron/q9/iso_encoder/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- 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/keychron/q9/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/keychron/q9') diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h index b63211102f..e051703d11 100644 --- a/keyboards/keychron/q9/config.h +++ b/keyboards/keychron/q9/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 15 - /* key matrix pins */ #define MATRIX_ROW_PINS \ { B3, A15, A14, A13 } -- 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/keychron/q9/ansi_encoder/config.h | 3 --- keyboards/keychron/q9/ansi_encoder/info.json | 5 +++++ keyboards/keychron/q9/iso_encoder/config.h | 3 --- keyboards/keychron/q9/iso_encoder/info.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'keyboards/keychron/q9') diff --git a/keyboards/keychron/q9/ansi_encoder/config.h b/keyboards/keychron/q9/ansi_encoder/config.h index 56f4966388..6850e5c2d6 100644 --- a/keyboards/keychron/q9/ansi_encoder/config.h +++ b/keyboards/keychron/q9/ansi_encoder/config.h @@ -21,9 +21,6 @@ #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL /* Encoder Configuration */ -#define ENCODERS_PAD_A { B4 } -#define ENCODERS_PAD_B { B5 } -#define ENCODER_RESOLUTION 4 #define ENCODER_DEFAULT_POS 0x3 /* Enable caps-lock LED */ diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json index 54719d5749..5100c18945 100644 --- a/keyboards/keychron/q9/ansi_encoder/info.json +++ b/keyboards/keychron/q9/ansi_encoder/info.json @@ -8,6 +8,11 @@ "pid": "0x0191", "device_version": "1.0.0" }, + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "B5"} + ] + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keychron/q9/iso_encoder/config.h b/keyboards/keychron/q9/iso_encoder/config.h index 0d7e2c5a50..65d7ad7708 100644 --- a/keyboards/keychron/q9/iso_encoder/config.h +++ b/keyboards/keychron/q9/iso_encoder/config.h @@ -21,9 +21,6 @@ #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL /* Encoder Configuration */ -#define ENCODERS_PAD_A { B4 } -#define ENCODERS_PAD_B { B5 } -#define ENCODER_RESOLUTION 4 #define ENCODER_DEFAULT_POS 0x3 /* Enable caps-lock LED */ diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json index 4e4819519d..dee0a8953a 100644 --- a/keyboards/keychron/q9/iso_encoder/info.json +++ b/keyboards/keychron/q9/iso_encoder/info.json @@ -8,6 +8,11 @@ "pid": "0x0193", "device_version": "1.0.0" }, + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "B5"} + ] + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { -- cgit v1.2.3