From e0115caab92167b23ff9dd9d1f68cd03c830bfec Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 1 Oct 2022 02:14:41 +1000 Subject: [PATCH] onekey: enable ADC for Bluepill and Blackpill (#18545) --- keyboards/handwired/onekey/blackpill_f401/halconf.h | 2 ++ keyboards/handwired/onekey/blackpill_f401/mcuconf.h | 3 +++ keyboards/handwired/onekey/blackpill_f411/halconf.h | 2 ++ keyboards/handwired/onekey/blackpill_f411/mcuconf.h | 3 +++ keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h | 3 +++ keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h | 3 +++ keyboards/handwired/onekey/bluepill/halconf.h | 2 ++ keyboards/handwired/onekey/bluepill/mcuconf.h | 3 +++ keyboards/handwired/onekey/bluepill_f103c6/halconf.h | 2 ++ keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h | 3 +++ 10 files changed, 26 insertions(+) diff --git a/keyboards/handwired/onekey/blackpill_f401/halconf.h b/keyboards/handwired/onekey/blackpill_f401/halconf.h index 020a7722f0d59c42f6fc5aa193c6092a426bab4a..4982bb5b49a2982513b58647f39ed70cb144895c 100644 --- a/keyboards/handwired/onekey/blackpill_f401/halconf.h +++ b/keyboards/handwired/onekey/blackpill_f401/halconf.h @@ -21,6 +21,8 @@ #pragma once +#define HAL_USE_ADC TRUE + #define HAL_USE_I2C TRUE #define HAL_USE_PWM TRUE diff --git a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h index e614a9dfa93f24299845bc7ca7a861b163d35518..1aa0fe4ce7df743a3316e614025029300f64a89c 100644 --- a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h +++ b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h @@ -18,6 +18,9 @@ #include_next "mcuconf.h" +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/onekey/blackpill_f411/halconf.h b/keyboards/handwired/onekey/blackpill_f411/halconf.h index 4a0da20890c74b8b7873d69f069a5a196d6b8a34..8225cc72088294ecc796cea11510b48bfed6dafa 100644 --- a/keyboards/handwired/onekey/blackpill_f411/halconf.h +++ b/keyboards/handwired/onekey/blackpill_f411/halconf.h @@ -21,6 +21,8 @@ #pragma once +#define HAL_USE_ADC TRUE + #define HAL_USE_I2C TRUE #define HAL_USE_PWM TRUE diff --git a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h index e614a9dfa93f24299845bc7ca7a861b163d35518..1aa0fe4ce7df743a3316e614025029300f64a89c 100644 --- a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h +++ b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h @@ -18,6 +18,9 @@ #include_next "mcuconf.h" +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h index e15870984f38146e873fbd456e21e258ad99da44..00aca25c36a00b9d7d270da9dc9a1e773ce3d34b 100644 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h @@ -16,7 +16,10 @@ #pragma once +#define HAL_USE_ADC TRUE + #define HAL_USE_I2C TRUE + #define HAL_USE_PWM TRUE #include_next diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h index d003af03e568e870de8464b406eed649518a200e..fcb7d84f969652bcf1026a60adeb79b9282c06a5 100755 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h @@ -18,6 +18,9 @@ #include_next "mcuconf.h" +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/onekey/bluepill/halconf.h b/keyboards/handwired/onekey/bluepill/halconf.h index 923b4e52d24d37f6db24c67395ad06e71a4179dc..dbc3e82a79a787dc698bf39bdc436c2ea654eee4 100644 --- a/keyboards/handwired/onekey/bluepill/halconf.h +++ b/keyboards/handwired/onekey/bluepill/halconf.h @@ -21,6 +21,8 @@ #pragma once +#define HAL_USE_ADC TRUE + #define HAL_USE_PWM TRUE #include_next diff --git a/keyboards/handwired/onekey/bluepill/mcuconf.h b/keyboards/handwired/onekey/bluepill/mcuconf.h index 5e94a97e21e6e8cd42e71ed12031f27b5d25d8c3..39834c135b65e0cb41dbdde7598756ec4be15137 100644 --- a/keyboards/handwired/onekey/bluepill/mcuconf.h +++ b/keyboards/handwired/onekey/bluepill/mcuconf.h @@ -23,6 +23,9 @@ #include_next +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE diff --git a/keyboards/handwired/onekey/bluepill_f103c6/halconf.h b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h index 923b4e52d24d37f6db24c67395ad06e71a4179dc..dbc3e82a79a787dc698bf39bdc436c2ea654eee4 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/halconf.h +++ b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h @@ -21,6 +21,8 @@ #pragma once +#define HAL_USE_ADC TRUE + #define HAL_USE_PWM TRUE #include_next diff --git a/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h index 5e94a97e21e6e8cd42e71ed12031f27b5d25d8c3..39834c135b65e0cb41dbdde7598756ec4be15137 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h +++ b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h @@ -23,6 +23,9 @@ #include_next +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE