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/v8/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/keychron/v8') diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h index c3f089e842..c5a3857f40 100644 --- a/keyboards/keychron/v8/config.h +++ b/keyboards/keychron/v8/config.h @@ -26,9 +26,6 @@ /* If uses PH3 with a stronger pull resistor then the following definition should be included */ // #define MATRIX_UNSELECT_DRIVE_HIGH -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 2 #define DRIVER_ADDR_1 0b1110111 -- 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/v8/ansi/info.json | 2 ++ keyboards/keychron/v8/ansi/rules.mk | 6 ------ keyboards/keychron/v8/ansi_encoder/info.json | 2 ++ keyboards/keychron/v8/ansi_encoder/rules.mk | 6 ------ keyboards/keychron/v8/iso/info.json | 2 ++ keyboards/keychron/v8/iso/rules.mk | 6 ------ keyboards/keychron/v8/iso_encoder/info.json | 2 ++ keyboards/keychron/v8/iso_encoder/rules.mk | 6 ------ 8 files changed, 8 insertions(+), 24 deletions(-) (limited to 'keyboards/keychron/v8') diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json index c097a39517..f1f2e75e4d 100644 --- a/keyboards/keychron/v8/ansi/info.json +++ b/keyboards/keychron/v8/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x0380", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_69": { "layout": [ diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk index 0116815f0b..6f738741e9 100644 --- a/keyboards/keychron/v8/ansi/rules.mk +++ b/keyboards/keychron/v8/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/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json index 32df68bde5..c33b8955e8 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0381", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_69": { "layout": [ diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk index 43b26ecc3a..f2cbf4a660 100644 --- a/keyboards/keychron/v8/ansi_encoder/rules.mk +++ b/keyboards/keychron/v8/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/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json index ee00d3f003..22b363d072 100644 --- a/keyboards/keychron/v8/iso/info.json +++ b/keyboards/keychron/v8/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x0382", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_70": { "layout": [ diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk index 6999bcc18e..e306f3211e 100644 --- a/keyboards/keychron/v8/iso/rules.mk +++ b/keyboards/keychron/v8/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/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json index bc5fea848d..ad546d0e33 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/info.json @@ -8,6 +8,8 @@ "pid": "0x0383", "device_version": "1.0.0" }, + "processor": "STM32L432", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_70": { "layout": [ diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk index 43b26ecc3a..f2cbf4a660 100644 --- a/keyboards/keychron/v8/iso_encoder/rules.mk +++ b/keyboards/keychron/v8/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 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/v8/ansi_encoder/config.h | 3 --- keyboards/keychron/v8/ansi_encoder/info.json | 5 +++++ keyboards/keychron/v8/iso_encoder/config.h | 3 --- keyboards/keychron/v8/iso_encoder/info.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'keyboards/keychron/v8') diff --git a/keyboards/keychron/v8/ansi_encoder/config.h b/keyboards/keychron/v8/ansi_encoder/config.h index 6d749eed37..57b9bd0270 100644 --- a/keyboards/keychron/v8/ansi_encoder/config.h +++ b/keyboards/keychron/v8/ansi_encoder/config.h @@ -22,9 +22,6 @@ #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) /* Encoder Configuration */ -#define ENCODERS_PAD_A { A10 } -#define ENCODERS_PAD_B { B5 } -#define ENCODER_RESOLUTION 4 #define ENCODER_DEFAULT_POS 0x3 /* Enable caps-lock LED */ diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json index c33b8955e8..f6a9de655b 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/info.json @@ -8,6 +8,11 @@ "pid": "0x0381", "device_version": "1.0.0" }, + "encoder": { + "rotary": [ + {"pin_a": "A10", "pin_b": "B5"} + ] + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keychron/v8/iso_encoder/config.h b/keyboards/keychron/v8/iso_encoder/config.h index b460669c24..0bb4fbf821 100644 --- a/keyboards/keychron/v8/iso_encoder/config.h +++ b/keyboards/keychron/v8/iso_encoder/config.h @@ -22,9 +22,6 @@ #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) /* Encoder Configuration */ -#define ENCODERS_PAD_A { A10 } -#define ENCODERS_PAD_B { B5 } -#define ENCODER_RESOLUTION 4 #define ENCODER_DEFAULT_POS 0x3 /* Enable caps-lock LED */ diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json index ad546d0e33..2abaeda111 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/info.json @@ -8,6 +8,11 @@ "pid": "0x0383", "device_version": "1.0.0" }, + "encoder": { + "rotary": [ + {"pin_a": "A10", "pin_b": "B5"} + ] + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { -- cgit v1.2.3