From 327f7ee9a74f1740106d46e65e909208a1372ad3 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 19 Jan 2023 12:05:29 +1100 Subject: [PATCH] Fixup ChibiOS header inclusion search ordering. (#19623) * Add STM32F446-Nucleo onekey. * Fixup onekey build for F446, all keymaps. * Fixup board inclusion search ordering. --- keyboards/akb/vero/mcuconf.h | 2 +- .../charybdis/3x5/blackpill/halconf.h | 2 +- .../charybdis/3x5/blackpill/mcuconf.h | 2 +- .../charybdis/3x5/keymaps/drashna/mcuconf.h | 2 +- .../charybdis/3x5/v2/splinky_2/mcuconf.h | 2 +- .../charybdis/3x5/v2/splinky_3/mcuconf.h | 2 +- .../charybdis/3x6/blackpill/halconf.h | 2 +- .../charybdis/3x6/blackpill/mcuconf.h | 2 +- .../charybdis/3x6/v2/splinky_2/mcuconf.h | 2 +- .../charybdis/3x6/v2/splinky_3/mcuconf.h | 2 +- .../charybdis/4x6/blackpill/halconf.h | 2 +- .../charybdis/4x6/blackpill/mcuconf.h | 2 +- .../charybdis/4x6/keymaps/drashna/mcuconf.h | 2 +- .../charybdis/4x6/v2/splinky_2/mcuconf.h | 2 +- .../charybdis/4x6/v2/splinky_3/mcuconf.h | 2 +- .../dilemma/3x5_2/assembled/halconf.h | 2 +- .../dilemma/3x5_2/assembled/mcuconf.h | 2 +- .../dilemma/3x5_2/keymaps/drashna/halconf.h | 2 +- .../dilemma/3x5_2/keymaps/drashna/mcuconf.h | 2 +- .../bastardkb/dilemma/3x5_2/splinky/halconf.h | 2 +- .../bastardkb/dilemma/3x5_2/splinky/mcuconf.h | 2 +- keyboards/bastardkb/dilemma/3x5_3/halconf.h | 2 +- keyboards/bastardkb/dilemma/3x5_3/mcuconf.h | 2 +- keyboards/controllerworks/mini36/halconf.h | 2 +- keyboards/controllerworks/mini36/mcuconf.h | 2 +- keyboards/controllerworks/mini42/halconf.h | 2 +- keyboards/controllerworks/mini42/mcuconf.h | 2 +- keyboards/drop/sense75/board.h | 2 +- keyboards/halokeys/elemental75/chconf.h | 2 +- .../6x6/blackpill_f411/mcuconf.h | 2 +- keyboards/handwired/macroboard/mcuconf.h | 2 +- .../handwired/onekey/blackpill_f401/mcuconf.h | 2 +- .../onekey/blackpill_f401_tinyuf2/mcuconf.h | 2 +- .../handwired/onekey/blackpill_f411/mcuconf.h | 2 +- .../onekey/blackpill_f411_tinyuf2/mcuconf.h | 2 +- .../handwired/onekey/evb_wb32f3g71/mcuconf.h | 2 +- .../handwired/onekey/evb_wb32fq95/mcuconf.h | 2 +- .../handwired/onekey/keymaps/default/keymap.c | 2 ++ .../handwired/onekey/nucleo_f446re/board.h | 9 ++++++++ .../handwired/onekey/nucleo_f446re/config.h | 16 +++++++++++++ .../handwired/onekey/nucleo_f446re/halconf.h | 10 ++++++++ .../handwired/onekey/nucleo_f446re/info.json | 15 ++++++++++++ .../handwired/onekey/nucleo_f446re/mcuconf.h | 23 +++++++++++++++++++ .../handwired/onekey/nucleo_f446re/readme.md | 5 ++++ .../handwired/onekey/nucleo_f446re/rules.mk | 1 + keyboards/handwired/onekey/proton_c/mcuconf.h | 2 +- keyboards/handwired/onekey/rp2040/mcuconf.h | 2 +- .../handwired/pill60/blackpill_f401/mcuconf.h | 2 +- .../handwired/pill60/blackpill_f411/mcuconf.h | 2 +- .../tractyl_manuform/5x6_right/f303/mcuconf.h | 2 +- .../tractyl_manuform/5x6_right/f411/mcuconf.h | 2 +- keyboards/handwired/uthol/rev3/mcuconf.h | 2 +- keyboards/keebio/sinc/rev3/halconf.h | 2 +- keyboards/keebio/sinc/rev3/mcuconf.h | 2 +- keyboards/kin80/blackpill401/mcuconf.h | 2 +- keyboards/kin80/blackpill411/mcuconf.h | 2 +- keyboards/linworks/whale75/chconf.h | 2 +- keyboards/linworks/whale75/mcuconf.h | 2 +- keyboards/mino_plus/soldered/mcuconf.h | 2 +- keyboards/moonlander/mcuconf.h | 2 +- keyboards/planck/ez/mcuconf.h | 2 +- keyboards/planck/rev6/mcuconf.h | 2 +- keyboards/planck/rev6_drop/mcuconf.h | 2 +- keyboards/preonic/rev3/mcuconf.h | 2 +- keyboards/preonic/rev3_drop/mcuconf.h | 2 +- .../splitkb/kyria/rev1/proton_c/chconf.h | 2 +- .../splitkb/kyria/rev2/proton_c/chconf.h | 2 +- keyboards/teleport/native/mcuconf.h | 2 +- keyboards/tzarc/ghoul/rev1/stm32/board.h | 2 +- keyboards/weirdo/geminate60/chconf.h | 2 +- keyboards/yandrstudio/buff67v3/board.h | 2 +- keyboards/yandrstudio/eau87/board.h | 2 +- keyboards/yandrstudio/eau_r2/board.h | 2 +- keyboards/yandrstudio/nightstar75/board.h | 2 +- keyboards/yandrstudio/nz64/board.h | 2 +- keyboards/yandrstudio/nz67v2/board.h | 2 +- keyboards/yandrstudio/tg67/board.h | 2 +- keyboards/yandrstudio/wave75/board.h | 2 +- keyboards/yandrstudio/yr6095/board.h | 2 +- keyboards/yandrstudio/yr80/board.h | 2 +- keyboards/yandrstudio/zhou65/board.h | 2 +- .../community/split_3x6_3/drashna/chconf.h | 2 +- lib/python/qmk/cli/lint.py | 23 +++++++++++++++++++ .../BLACKPILL_STM32_F401/configs/board.h | 2 +- .../BLACKPILL_STM32_F411/configs/board.h | 2 +- .../chibios/boards/BONSAI_C4/configs/board.h | 2 +- .../GENERIC_PROMICRO_RP2040/configs/board.h | 2 +- .../boards/GENERIC_RP_RP2040/configs/board.h | 2 +- .../GENERIC_STM32_F072XB/configs/board.h | 2 +- .../GENERIC_STM32_F303XC/configs/board.h | 2 +- .../GENERIC_STM32_F401XC/configs/board.h | 2 +- .../GENERIC_STM32_F405XG/configs/board.h | 2 +- .../GENERIC_STM32_F407XE/configs/board.h | 2 +- .../GENERIC_STM32_F411XE/configs/board.h | 2 +- .../GENERIC_STM32_F446XE/configs/board.h | 2 +- .../GENERIC_STM32_L412XB/configs/board.h | 2 +- .../GENERIC_STM32_L433XC/configs/board.h | 2 +- .../chibios/boards/QMK_PM2040/configs/board.h | 2 +- .../boards/QMK_PROTON_C/configs/board.h | 2 +- .../chibios/boards/STEMCELL/configs/board.h | 2 +- 100 files changed, 195 insertions(+), 91 deletions(-) create mode 100644 keyboards/handwired/onekey/nucleo_f446re/board.h create mode 100644 keyboards/handwired/onekey/nucleo_f446re/config.h create mode 100644 keyboards/handwired/onekey/nucleo_f446re/halconf.h create mode 100644 keyboards/handwired/onekey/nucleo_f446re/info.json create mode 100644 keyboards/handwired/onekey/nucleo_f446re/mcuconf.h create mode 100644 keyboards/handwired/onekey/nucleo_f446re/readme.md create mode 100644 keyboards/handwired/onekey/nucleo_f446re/rules.mk diff --git a/keyboards/akb/vero/mcuconf.h b/keyboards/akb/vero/mcuconf.h index 3439c90d524aa677d6ee06cc31e51800809ca688..bf2d83997cb2bdf30bb99ef2971e754752fb4100 100644 --- a/keyboards/akb/vero/mcuconf.h +++ b/keyboards/akb/vero/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include_next "mcuconf.h" +#include_next /* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */ #undef STM32_PLLM_VALUE #define STM32_PLLM_VALUE 8 diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h index 0e5caa9f9a9d422b6f1c96df5d830fead85c8930..c43f84e0de25d8519c4abff08f79e7263e83e8ba 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h @@ -24,4 +24,4 @@ #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#include_next "halconf.h" +#include_next diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h index 3b9c9056f8c9333d2dee6e6feb8bbff4cee4b2b5..46b3b42f8b8a81325542fb411945171e67dbc3a6 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h @@ -19,7 +19,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h index 9c4096701558fa7403c217fb785c5674056b79e3..3defeed4dd64c6d4978a104aeafbccd78c5a589a 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill) # undef STM32_I2C_USE_I2C1 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h index 0fdd67c3a29a46135cb4c5a64a86ade2423d261b..6aaf31428c123624b1c1337a9e704db83c1eae01 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI0 #define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h index 0fdd67c3a29a46135cb4c5a64a86ade2423d261b..6aaf31428c123624b1c1337a9e704db83c1eae01 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI0 #define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h index 78885b6870822908ee0e1663a56be54806e8a829..1ba700a80fa1e398e64748e7f072267b3aca27fd 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h @@ -24,4 +24,4 @@ #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#include_next "halconf.h" +#include_next diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h index 7adcb837deb834520d2a0b7c493ee347dc9ebed1..e4cde4880be8c20049e191ae6c2ba31902817247 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h @@ -19,7 +19,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h index 0fdd67c3a29a46135cb4c5a64a86ade2423d261b..6aaf31428c123624b1c1337a9e704db83c1eae01 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI0 #define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h index 0fdd67c3a29a46135cb4c5a64a86ade2423d261b..6aaf31428c123624b1c1337a9e704db83c1eae01 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI0 #define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h index 0e5caa9f9a9d422b6f1c96df5d830fead85c8930..c43f84e0de25d8519c4abff08f79e7263e83e8ba 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h @@ -24,4 +24,4 @@ #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#include_next "halconf.h" +#include_next diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h index 3b9c9056f8c9333d2dee6e6feb8bbff4cee4b2b5..46b3b42f8b8a81325542fb411945171e67dbc3a6 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h @@ -19,7 +19,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h index 3a23d5f3707f1d41010dd79add9fdb9425676c21..0541043c5384b28546d2f0aa93f062d23a736e43 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) # undef STM32_PWM_USE_ADVANCED diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h index 0fdd67c3a29a46135cb4c5a64a86ade2423d261b..6aaf31428c123624b1c1337a9e704db83c1eae01 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI0 #define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h index 0fdd67c3a29a46135cb4c5a64a86ade2423d261b..6aaf31428c123624b1c1337a9e704db83c1eae01 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI0 #define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h index 7a79bec953f67ca290a0d1d73d445c84c635a1ea..57d15376d63aa8f7f8e6661acdd597739b19c42a 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h @@ -19,4 +19,4 @@ #define HAL_USE_SPI TRUE -#include_next "halconf.h" +#include_next diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h index b54d705b54260565aa2fc3a28ddc8e89c9dfef9b..81821c159dca91a858a6ed21c60fd6fb98c652ea 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI1 #define RP_SPI_USE_SPI1 TRUE diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h index 135994a43cbcf6f69b4d847952b8c1ecdafe702e..906bd65197807a3f24e580d7481ad5db1eeff950 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h @@ -20,4 +20,4 @@ #define HAL_USE_SPI TRUE #define HAL_USE_I2C TRUE -#include_next "halconf.h" +#include_next diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h index f9aa8946657f2aaf5bb8e10abd331fa4ccc80287..f194dd225ced4fd65f34b53b7a45a8c4002d529f 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI1 #define RP_SPI_USE_SPI1 TRUE diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h index a4c25c090a2e213f205bc9665de1ff736bcf9892..2e098f5113d93a9857e4520459b403f118957458 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h @@ -18,4 +18,4 @@ #define HAL_USE_I2C TRUE -#include_next "halconf.h" +#include_next diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h index 5e47eac54f95e926f5f2ac06ee9911140b58331f..c748d941e9a66427cf4ff0380580cf67d9220a57 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_I2C_USE_I2C1 #define RP_I2C_USE_I2C1 TRUE diff --git a/keyboards/bastardkb/dilemma/3x5_3/halconf.h b/keyboards/bastardkb/dilemma/3x5_3/halconf.h index a3774605a8f708c5f3affce06b7e9061c1fa0d7d..b79b0f9e8867efb1970bbca124d5730c03804e2d 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/halconf.h +++ b/keyboards/bastardkb/dilemma/3x5_3/halconf.h @@ -20,4 +20,4 @@ #define HAL_USE_I2C TRUE #define HAL_USE_SPI TRUE -#include_next "halconf.h" +#include_next diff --git a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h index f9aa8946657f2aaf5bb8e10abd331fa4ccc80287..f194dd225ced4fd65f34b53b7a45a8c4002d529f 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h +++ b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_SPI_USE_SPI1 #define RP_SPI_USE_SPI1 TRUE diff --git a/keyboards/controllerworks/mini36/halconf.h b/keyboards/controllerworks/mini36/halconf.h index 1664802d6c8ac7edd48d62d586234412d7365a4e..68ccc528d6322999a5d6e868b456ba70ad062d01 100644 --- a/keyboards/controllerworks/mini36/halconf.h +++ b/keyboards/controllerworks/mini36/halconf.h @@ -19,4 +19,4 @@ #define HAL_USE_I2C TRUE -#include_next "halconf.h" +#include_next diff --git a/keyboards/controllerworks/mini36/mcuconf.h b/keyboards/controllerworks/mini36/mcuconf.h index 7f0840c7a7df3b61cddc009b91152f15bb4b2b29..c92e5035a842eef6cad78ab54a054f021dd2481e 100644 --- a/keyboards/controllerworks/mini36/mcuconf.h +++ b/keyboards/controllerworks/mini36/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_I2C_USE_I2C0 #define RP_I2C_USE_I2C0 TRUE \ No newline at end of file diff --git a/keyboards/controllerworks/mini42/halconf.h b/keyboards/controllerworks/mini42/halconf.h index 1664802d6c8ac7edd48d62d586234412d7365a4e..68ccc528d6322999a5d6e868b456ba70ad062d01 100644 --- a/keyboards/controllerworks/mini42/halconf.h +++ b/keyboards/controllerworks/mini42/halconf.h @@ -19,4 +19,4 @@ #define HAL_USE_I2C TRUE -#include_next "halconf.h" +#include_next diff --git a/keyboards/controllerworks/mini42/mcuconf.h b/keyboards/controllerworks/mini42/mcuconf.h index 7f0840c7a7df3b61cddc009b91152f15bb4b2b29..c92e5035a842eef6cad78ab54a054f021dd2481e 100644 --- a/keyboards/controllerworks/mini42/mcuconf.h +++ b/keyboards/controllerworks/mini42/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_I2C_USE_I2C0 #define RP_I2C_USE_I2C0 TRUE \ No newline at end of file diff --git a/keyboards/drop/sense75/board.h b/keyboards/drop/sense75/board.h index fc227f69b19ec144c65150a9f7eea6e97e4c9987..5de178fa61c69d6d4d77d110b3bc97145dbd7a19 100644 --- a/keyboards/drop/sense75/board.h +++ b/keyboards/drop/sense75/board.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000U diff --git a/keyboards/halokeys/elemental75/chconf.h b/keyboards/halokeys/elemental75/chconf.h index b780a0e77b2ee94057b6604ed1fcfbdbe69bb2e9..f826479adf30593cc9f6050f0668d73b68f943f1 100644 --- a/keyboards/halokeys/elemental75/chconf.h +++ b/keyboards/halokeys/elemental75/chconf.h @@ -18,4 +18,4 @@ // so we need to change resolution and frequency to match. #define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_FREQUENCY 10000 -#include_next "chconf.h" +#include_next diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h index b8bb363d9123fc4111d72e15b121f6eb48432544..f1a02293fd03dfee966fc46b7ed118e59a1ae162 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE diff --git a/keyboards/handwired/macroboard/mcuconf.h b/keyboards/handwired/macroboard/mcuconf.h index e62fb3341eaaf20df0993efc6a7ed5674a684c64..94fa17b950458c3aa1321352da4bc709ecdad55a 100644 --- a/keyboards/handwired/macroboard/mcuconf.h +++ b/keyboards/handwired/macroboard/mcuconf.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE diff --git a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h index fcb7d84f969652bcf1026a60adeb79b9282c06a5..f69da38b271e91d881357c595cf6f8cd92864663 100644 --- a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h +++ b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_ADC_USE_ADC1 #define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h index fcb7d84f969652bcf1026a60adeb79b9282c06a5..f69da38b271e91d881357c595cf6f8cd92864663 100755 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_ADC_USE_ADC1 #define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h index fcb7d84f969652bcf1026a60adeb79b9282c06a5..f69da38b271e91d881357c595cf6f8cd92864663 100644 --- a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h +++ b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_ADC_USE_ADC1 #define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h index fcb7d84f969652bcf1026a60adeb79b9282c06a5..f69da38b271e91d881357c595cf6f8cd92864663 100755 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_ADC_USE_ADC1 #define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h index 7ef36ff66c7d5bd48c446d303a37e582aa409d1f..322282b4b3cb9400edd87988c8a4dec1050e27b1 100644 --- a/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h +++ b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include_next "mcuconf.h" +#include_next #undef WB32_ADC_USE_ADC1 #define WB32_ADC_USE_ADC1 TRUE diff --git a/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h index 7ef36ff66c7d5bd48c446d303a37e582aa409d1f..322282b4b3cb9400edd87988c8a4dec1050e27b1 100644 --- a/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h +++ b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include_next "mcuconf.h" +#include_next #undef WB32_ADC_USE_ADC1 #define WB32_ADC_USE_ADC1 TRUE diff --git a/keyboards/handwired/onekey/keymaps/default/keymap.c b/keyboards/handwired/onekey/keymaps/default/keymap.c index a5782f7a1368a398439ebc941d6dcf829bbb5c33..1c0375e56ccc7d9ee9c7cc03a316eeed0e167d56 100644 --- a/keyboards/handwired/onekey/keymaps/default/keymap.c +++ b/keyboards/handwired/onekey/keymaps/default/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2020 QMK +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/handwired/onekey/nucleo_f446re/board.h b/keyboards/handwired/onekey/nucleo_f446re/board.h new file mode 100644 index 0000000000000000000000000000000000000000..0c5f4dde799a00c4e7efe4edfc785e82e15ecba9 --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_f446re/board.h @@ -0,0 +1,9 @@ +// Copyright 2023 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include_next + +#undef STM32_HSECLK +#define STM32_HSECLK 8000000U +#define STM32_HSE_BYPASS diff --git a/keyboards/handwired/onekey/nucleo_f446re/config.h b/keyboards/handwired/onekey/nucleo_f446re/config.h new file mode 100644 index 0000000000000000000000000000000000000000..612cbf0eab08120e14eaa34c199607c6aa51cfbf --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_f446re/config.h @@ -0,0 +1,16 @@ +// Copyright 2021 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include "config_common.h" + +#define BACKLIGHT_PWM_DRIVER PWMD4 +#define BACKLIGHT_PWM_CHANNEL 3 +#define BACKLIGHT_PAL_MODE 2 + +#define RGB_CI_PIN B13 + +#define ADC_PIN A0 + +#define SOLENOID_PINS { B12, B13, B14, B15 } +#define SOLENOID_PINS_ACTIVE_STATE { high, high, low } diff --git a/keyboards/handwired/onekey/nucleo_f446re/halconf.h b/keyboards/handwired/onekey/nucleo_f446re/halconf.h new file mode 100644 index 0000000000000000000000000000000000000000..e3fd1cf6e1ad17a0587f34626949ca628bbeb09a --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_f446re/halconf.h @@ -0,0 +1,10 @@ +// Copyright 2023 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define HAL_USE_ADC TRUE +#define HAL_USE_SPI TRUE +#define HAL_USE_I2C TRUE +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/info.json new file mode 100644 index 0000000000000000000000000000000000000000..6b9206f98731d3c020ccc83633a0a9e993d3031b --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_f446re/info.json @@ -0,0 +1,15 @@ +{ + "keyboard_name": "Onekey Nucleo F446RE", + "processor": "STM32F446", + "bootloader": "stm32-dfu", + "matrix_pins": { + "cols": ["A2"], + "rows": ["A1"] + }, + "backlight": { + "pin": "B8" + }, + "rgblight": { + "pin": "A0" + } +} diff --git a/keyboards/handwired/onekey/nucleo_f446re/mcuconf.h b/keyboards/handwired/onekey/nucleo_f446re/mcuconf.h new file mode 100644 index 0000000000000000000000000000000000000000..701d61d31de8711bf4994236cef0f31838240eaf --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_f446re/mcuconf.h @@ -0,0 +1,23 @@ +// Copyright 2023 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include_next + +#undef STM32_PLLM_VALUE +#define STM32_PLLM_VALUE 4 + +#undef STM32_PLLSAIM_VALUE +#define STM32_PLLSAIM_VALUE 4 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + +#undef STM32_PWM_USE_TIM4 +#define STM32_PWM_USE_TIM4 TRUE + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE + +#undef STM32_SPI_USE_SPI1 +#define STM32_SPI_USE_SPI1 TRUE diff --git a/keyboards/handwired/onekey/nucleo_f446re/readme.md b/keyboards/handwired/onekey/nucleo_f446re/readme.md new file mode 100644 index 0000000000000000000000000000000000000000..c7d13cb973859d82f4bacdef296cda290556791b --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_f446re/readme.md @@ -0,0 +1,5 @@ +# STM32 Nucleo-L432 onekey + +To trigger keypress, short together pins *A1* and *A2*. + +You'll also need to connect `VIN`, `GND`, USB `D+` to `PA12`/`D2`, and USB `D-` to `PA11`/`D10`. diff --git a/keyboards/handwired/onekey/nucleo_f446re/rules.mk b/keyboards/handwired/onekey/nucleo_f446re/rules.mk new file mode 100644 index 0000000000000000000000000000000000000000..8515c3fae029d00f45f7ca428b893be378185880 --- /dev/null +++ b/keyboards/handwired/onekey/nucleo_f446re/rules.mk @@ -0,0 +1 @@ +SRC += analog.c diff --git a/keyboards/handwired/onekey/proton_c/mcuconf.h b/keyboards/handwired/onekey/proton_c/mcuconf.h index 935056eb6a420126c199afcab80e054122451048..5bf9e0544b88facb02fed41ea1b6fdc1be8b5683 100644 --- a/keyboards/handwired/onekey/proton_c/mcuconf.h +++ b/keyboards/handwired/onekey/proton_c/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_ADC_USE_ADC1 #define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/handwired/onekey/rp2040/mcuconf.h b/keyboards/handwired/onekey/rp2040/mcuconf.h index 5c2587395d7792148d601c7249081fbc42910bfa..e24a0d4f24ebebfac27272b681aaf77cfc5e78bd 100644 --- a/keyboards/handwired/onekey/rp2040/mcuconf.h +++ b/keyboards/handwired/onekey/rp2040/mcuconf.h @@ -3,7 +3,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_PWM_USE_PWM0 #define RP_PWM_USE_PWM0 TRUE diff --git a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h index a8b0a56602c6f975ed341e522a0b51286c35e427..ab89514fb1c769e13d9f3415c79c6e82bbc84b69 100644 --- a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h +++ b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h index a8b0a56602c6f975ed341e522a0b51286c35e427..ab89514fb1c769e13d9f3415c79c6e82bbc84b69 100644 --- a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h +++ b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h index 5525a077d27c570d02652c6f1946dfacc6da45b9..12add21a0a2c22b3bbf61d79b32c689cc0f2ac01 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h index fd71b54b77da68b402755e736129edd7d6d48e9d..d3a21f72c4d37c8ad8c8531291809f3dfc385427 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/uthol/rev3/mcuconf.h b/keyboards/handwired/uthol/rev3/mcuconf.h index 24fb0ef3a5715dd210e4f7aeb5c715254865cd41..437f957fa653daeffca37870695da3f746fc8fac 100644 --- a/keyboards/handwired/uthol/rev3/mcuconf.h +++ b/keyboards/handwired/uthol/rev3/mcuconf.h @@ -16,7 +16,7 @@ */ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/keebio/sinc/rev3/halconf.h b/keyboards/keebio/sinc/rev3/halconf.h index a4c25c090a2e213f205bc9665de1ff736bcf9892..2e098f5113d93a9857e4520459b403f118957458 100644 --- a/keyboards/keebio/sinc/rev3/halconf.h +++ b/keyboards/keebio/sinc/rev3/halconf.h @@ -18,4 +18,4 @@ #define HAL_USE_I2C TRUE -#include_next "halconf.h" +#include_next diff --git a/keyboards/keebio/sinc/rev3/mcuconf.h b/keyboards/keebio/sinc/rev3/mcuconf.h index 5e47eac54f95e926f5f2ac06ee9911140b58331f..c748d941e9a66427cf4ff0380580cf67d9220a57 100644 --- a/keyboards/keebio/sinc/rev3/mcuconf.h +++ b/keyboards/keebio/sinc/rev3/mcuconf.h @@ -17,7 +17,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef RP_I2C_USE_I2C1 #define RP_I2C_USE_I2C1 TRUE diff --git a/keyboards/kin80/blackpill401/mcuconf.h b/keyboards/kin80/blackpill401/mcuconf.h index e614a9dfa93f24299845bc7ca7a861b163d35518..76250cb8962b7b05ae4ee9e7819227ebd15f8e1b 100644 --- a/keyboards/kin80/blackpill401/mcuconf.h +++ b/keyboards/kin80/blackpill401/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/kin80/blackpill411/mcuconf.h b/keyboards/kin80/blackpill411/mcuconf.h index e614a9dfa93f24299845bc7ca7a861b163d35518..76250cb8962b7b05ae4ee9e7819227ebd15f8e1b 100644 --- a/keyboards/kin80/blackpill411/mcuconf.h +++ b/keyboards/kin80/blackpill411/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/linworks/whale75/chconf.h b/keyboards/linworks/whale75/chconf.h index d32319aacf01867b6e64a8536af25733b3aad770..156fcf1ee2f4ac8763e1751cdc8747e4a393b1b8 100644 --- a/keyboards/linworks/whale75/chconf.h +++ b/keyboards/linworks/whale75/chconf.h @@ -14,4 +14,4 @@ * along with this program. If not, see . */ -#include_next "chconf.h" +#include_next diff --git a/keyboards/linworks/whale75/mcuconf.h b/keyboards/linworks/whale75/mcuconf.h index 04499470866069d258369d7b854ffacef7857467..f6dc94d2db200f88f8ccdeb8a2406fab18777352 100644 --- a/keyboards/linworks/whale75/mcuconf.h +++ b/keyboards/linworks/whale75/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include_next "mcuconf.h" +#include_next // Underglow uses TIM4, Backlight TIM1, so both are enabled here. #undef STM32_PWM_USE_TIM1 diff --git a/keyboards/mino_plus/soldered/mcuconf.h b/keyboards/mino_plus/soldered/mcuconf.h index c1d45157c7339259f36b4e96deb008f5866a8d9a..7968bd26da8779173696b11c38b62dc6c206dd38 100644 --- a/keyboards/mino_plus/soldered/mcuconf.h +++ b/keyboards/mino_plus/soldered/mcuconf.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include_next "mcuconf.h" +#include_next #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE \ No newline at end of file diff --git a/keyboards/moonlander/mcuconf.h b/keyboards/moonlander/mcuconf.h index 69f458a9377bdc133032209cdcaa9549fd1e0dc8..032c853f4ebca2b55d0af05af38ce4e92e893ec8 100644 --- a/keyboards/moonlander/mcuconf.h +++ b/keyboards/moonlander/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next // for i2c expander, and ISSI #undef STM32_I2C_USE_I2C1 diff --git a/keyboards/planck/ez/mcuconf.h b/keyboards/planck/ez/mcuconf.h index 44035e782720b6ab028767330290470b38f8416c..7475b0990c6962c86064c481151c8187835678a9 100644 --- a/keyboards/planck/ez/mcuconf.h +++ b/keyboards/planck/ez/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next // for i2c expander, and ISSI #undef STM32_I2C_USE_I2C1 diff --git a/keyboards/planck/rev6/mcuconf.h b/keyboards/planck/rev6/mcuconf.h index dde67871cddad956caceef779377fffd335e3454..540e708a6ee942cd3edd40e05e053c7aabb12908 100644 --- a/keyboards/planck/rev6/mcuconf.h +++ b/keyboards/planck/rev6/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include_next "mcuconf.h" +#include_next // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used // on the Planck requires the use of TIM2 to run PWM -- rework which timers are diff --git a/keyboards/planck/rev6_drop/mcuconf.h b/keyboards/planck/rev6_drop/mcuconf.h index d7c29fcf65be778d51cb628f14e893b5ebe4f387..20337afbb27cc2ecfe74e20aba9d407b1143e473 100644 --- a/keyboards/planck/rev6_drop/mcuconf.h +++ b/keyboards/planck/rev6_drop/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include_next "mcuconf.h" +#include_next // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used // on the Planck requires the use of TIM2 to run PWM -- rework which timers are diff --git a/keyboards/preonic/rev3/mcuconf.h b/keyboards/preonic/rev3/mcuconf.h index fbc4e7ca62eea0c93c19ba7e4eca8e3a46f9c7c2..f534faccaf1eab99ce9131d3b964535379c9572d 100644 --- a/keyboards/preonic/rev3/mcuconf.h +++ b/keyboards/preonic/rev3/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include_next "mcuconf.h" +#include_next // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used // on the Planck requires the use of TIM2 to run PWM -- rework which timers are diff --git a/keyboards/preonic/rev3_drop/mcuconf.h b/keyboards/preonic/rev3_drop/mcuconf.h index b51bf6708e73aa375645db55df53fe11f452ae3a..838a3bb69ee1418c7a3a96feb12f6654c1c500bd 100644 --- a/keyboards/preonic/rev3_drop/mcuconf.h +++ b/keyboards/preonic/rev3_drop/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include_next "mcuconf.h" +#include_next // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used // on the Planck requires the use of TIM2 to run PWM -- rework which timers are diff --git a/keyboards/splitkb/kyria/rev1/proton_c/chconf.h b/keyboards/splitkb/kyria/rev1/proton_c/chconf.h index 7ca1d3d2431055a6393d2c90934bb860b3ee2b43..8833e3d746fbee32f6a0d4f43d65266862767953 100644 --- a/keyboards/splitkb/kyria/rev1/proton_c/chconf.h +++ b/keyboards/splitkb/kyria/rev1/proton_c/chconf.h @@ -19,4 +19,4 @@ #define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_FREQUENCY 10000 -#include_next "chconf.h" +#include_next diff --git a/keyboards/splitkb/kyria/rev2/proton_c/chconf.h b/keyboards/splitkb/kyria/rev2/proton_c/chconf.h index 7ca1d3d2431055a6393d2c90934bb860b3ee2b43..8833e3d746fbee32f6a0d4f43d65266862767953 100644 --- a/keyboards/splitkb/kyria/rev2/proton_c/chconf.h +++ b/keyboards/splitkb/kyria/rev2/proton_c/chconf.h @@ -19,4 +19,4 @@ #define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_FREQUENCY 10000 -#include_next "chconf.h" +#include_next diff --git a/keyboards/teleport/native/mcuconf.h b/keyboards/teleport/native/mcuconf.h index 8b5d373bc3e1b735e13760d1c00fa7f152abbfb9..ff40f7ec9d9c7e613c07de8d6d71afade2a90576 100644 --- a/keyboards/teleport/native/mcuconf.h +++ b/keyboards/teleport/native/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include_next "mcuconf.h" +#include_next /* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */ #undef STM32_PLLM_VALUE diff --git a/keyboards/tzarc/ghoul/rev1/stm32/board.h b/keyboards/tzarc/ghoul/rev1/stm32/board.h index 5379bd4a179bd9a7311fc23461881b0c589048c7..aadaac044934e8e514d73f7e196d6edbe2f8b0d8 100644 --- a/keyboards/tzarc/ghoul/rev1/stm32/board.h +++ b/keyboards/tzarc/ghoul/rev1/stm32/board.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#include_next "board.h" +#include_next #ifdef BOARD_OTG_NOVBUSSENS # undef BOARD_OTG_NOVBUSSENS diff --git a/keyboards/weirdo/geminate60/chconf.h b/keyboards/weirdo/geminate60/chconf.h index d58807924a0087a866132c29eb6b2ad43a5f4216..a70b65c879d47fcabef070e316fa63ce7b04e56b 100644 --- a/keyboards/weirdo/geminate60/chconf.h +++ b/keyboards/weirdo/geminate60/chconf.h @@ -18,4 +18,4 @@ // so we need to change resolution and frequency to match. #define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_FREQUENCY 10000 -#include_next "chconf.h" +#include_next diff --git a/keyboards/yandrstudio/buff67v3/board.h b/keyboards/yandrstudio/buff67v3/board.h index d83804babdf7f250ead2c2f7df5f3380ca4010e2..e474f8ab33ff4bca9a7bb54b51f41b3a9f549b98 100644 --- a/keyboards/yandrstudio/buff67v3/board.h +++ b/keyboards/yandrstudio/buff67v3/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/eau87/board.h b/keyboards/yandrstudio/eau87/board.h index d83804babdf7f250ead2c2f7df5f3380ca4010e2..e474f8ab33ff4bca9a7bb54b51f41b3a9f549b98 100644 --- a/keyboards/yandrstudio/eau87/board.h +++ b/keyboards/yandrstudio/eau87/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/eau_r2/board.h b/keyboards/yandrstudio/eau_r2/board.h index a667bee461b6ba553db4cdb540d1658484d9a444..49270b36a05068903506f503d29ef0ae084ddd44 100644 --- a/keyboards/yandrstudio/eau_r2/board.h +++ b/keyboards/yandrstudio/eau_r2/board.h @@ -16,7 +16,7 @@ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/nightstar75/board.h b/keyboards/yandrstudio/nightstar75/board.h index d83804babdf7f250ead2c2f7df5f3380ca4010e2..e474f8ab33ff4bca9a7bb54b51f41b3a9f549b98 100644 --- a/keyboards/yandrstudio/nightstar75/board.h +++ b/keyboards/yandrstudio/nightstar75/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/nz64/board.h b/keyboards/yandrstudio/nz64/board.h index 8a068cd8831c6eec24840471c26c9feed31e119e..aaa6d1e5f4c9fde532448a8f4df232d066cf8e80 100644 --- a/keyboards/yandrstudio/nz64/board.h +++ b/keyboards/yandrstudio/nz64/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/nz67v2/board.h b/keyboards/yandrstudio/nz67v2/board.h index a667bee461b6ba553db4cdb540d1658484d9a444..49270b36a05068903506f503d29ef0ae084ddd44 100644 --- a/keyboards/yandrstudio/nz67v2/board.h +++ b/keyboards/yandrstudio/nz67v2/board.h @@ -16,7 +16,7 @@ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/tg67/board.h b/keyboards/yandrstudio/tg67/board.h index d83804babdf7f250ead2c2f7df5f3380ca4010e2..e474f8ab33ff4bca9a7bb54b51f41b3a9f549b98 100644 --- a/keyboards/yandrstudio/tg67/board.h +++ b/keyboards/yandrstudio/tg67/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/wave75/board.h b/keyboards/yandrstudio/wave75/board.h index d83804babdf7f250ead2c2f7df5f3380ca4010e2..e474f8ab33ff4bca9a7bb54b51f41b3a9f549b98 100644 --- a/keyboards/yandrstudio/wave75/board.h +++ b/keyboards/yandrstudio/wave75/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/yr6095/board.h b/keyboards/yandrstudio/yr6095/board.h index d83804babdf7f250ead2c2f7df5f3380ca4010e2..e474f8ab33ff4bca9a7bb54b51f41b3a9f549b98 100644 --- a/keyboards/yandrstudio/yr6095/board.h +++ b/keyboards/yandrstudio/yr6095/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/yr80/board.h b/keyboards/yandrstudio/yr80/board.h index 0723a9c6b5e94c812d985be1583c87048fd8ab5b..b33982f7e66f54f09cf954e8e2cf1bbea7ec7ab8 100644 --- a/keyboards/yandrstudio/yr80/board.h +++ b/keyboards/yandrstudio/yr80/board.h @@ -16,7 +16,7 @@ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/zhou65/board.h b/keyboards/yandrstudio/zhou65/board.h index 8a068cd8831c6eec24840471c26c9feed31e119e..aaa6d1e5f4c9fde532448a8f4df232d066cf8e80 100644 --- a/keyboards/yandrstudio/zhou65/board.h +++ b/keyboards/yandrstudio/zhou65/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/layouts/community/split_3x6_3/drashna/chconf.h b/layouts/community/split_3x6_3/drashna/chconf.h index 9dbc78b973012d3556788d75ad0bd620fac6a5e4..1e277d357dd3d3a8ecd6cd58036f8740dd2a5c61 100644 --- a/layouts/community/split_3x6_3/drashna/chconf.h +++ b/layouts/community/split_3x6_3/drashna/chconf.h @@ -7,5 +7,5 @@ #if __has_include("platforms/chibios/common/configs/chconf.h") # include_next "platforms/chibios/common/configs/chconf.h" #else -# include_next "chconf.h" +# include_next #endif diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py index c67809a697d9ffc1c5e37d273a7e544dbd17f54f..897a6c4c0d0d7035a38beed97099924472ab617d 100644 --- a/lib/python/qmk/cli/lint.py +++ b/lib/python/qmk/cli/lint.py @@ -12,6 +12,8 @@ from qmk.path import is_keyboard, keyboard from qmk.git import git_get_ignored_files from qmk.c_parse import c_source_files +CHIBIOS_CONF_CHECKS = ['chconf.h', 'halconf.h', 'mcuconf.h', 'board.h'] + def _list_defaultish_keymaps(kb): """Return default like keymaps for a given keyboard @@ -64,6 +66,15 @@ def _handle_json_errors(kb, info): return ok +def _chibios_conf_includenext_check(target): + """Check the ChibiOS conf.h for the correct inclusion of the next conf.h + """ + for i, line in enumerate(target.open()): + if f'#include_next "{target.name}"' in line: + return f'Found `#include_next "{target.name}"` on line {i} of {target}, should be `#include_next <{target.name}>` (use angle brackets, not quotes)' + return None + + def _rules_mk_assignment_only(kb): """Check the keyboard-level rules.mk to ensure it only has assignments. """ @@ -121,6 +132,12 @@ def keymap_check(kb, km): cli.log.error(f'{kb}/{km}: The file "{file}" does not have a license header!') ok = False + if file.name in CHIBIOS_CONF_CHECKS: + check_error = _chibios_conf_includenext_check(file) + if check_error is not None: + cli.log.error(f'{kb}/{km}: {check_error}') + ok = False + return ok @@ -153,6 +170,12 @@ def keyboard_check(kb): cli.log.error(f'{kb}: The file "{file}" does not have a license header!') ok = False + if file.name in CHIBIOS_CONF_CHECKS: + check_error = _chibios_conf_includenext_check(file) + if check_error is not None: + cli.log.error(f'{kb}: {check_error}') + ok = False + return ok diff --git a/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h index 78dcbac05c89694b9bd35ae443b66015a9983201..772204ae5d79c4826fea3082238ff43595c05ee0 100644 --- a/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h +++ b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next // Force B9 as input to align with qmk defaults #undef VAL_GPIOB_MODER diff --git a/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h index 30af6b0c8608281964074b542656b12271b42f9d..81c80b27731e406d3454783b4a8577855dd22580 100644 --- a/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h +++ b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h @@ -15,6 +15,6 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/BONSAI_C4/configs/board.h b/platforms/chibios/boards/BONSAI_C4/configs/board.h index f1ee51c91f59a56fb0634e6f15159442e6529285..372b9bb8bc3dd32ea5ef5160c0ee101c62ee75a7 100644 --- a/platforms/chibios/boards/BONSAI_C4/configs/board.h +++ b/platforms/chibios/boards/BONSAI_C4/configs/board.h @@ -15,6 +15,6 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS \ No newline at end of file diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h index b4363595d019d23534daa9aee5c7277b4bb0907e..f0e95958965146fa6a8aeafbc09dd1adf8fff7b3 100644 --- a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h +++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h @@ -3,7 +3,7 @@ #pragma once -#include_next "board.h" +#include_next #undef BOARD_RP_PICO_RP2040 #define BOARD_GENERIC_PROMICRO_RP2040 diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h index 052050c944983f3e57fcd172b3101fad39c13337..89f4f0d61cd765236a3eaa7553b15c4da8a792dc 100644 --- a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h +++ b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h @@ -3,7 +3,7 @@ #pragma once -#include_next "board.h" +#include_next #undef BOARD_RP_PICO_RP2040 #define BOARD_GENERIC_RP2040 diff --git a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h index 30af6b0c8608281964074b542656b12271b42f9d..81c80b27731e406d3454783b4a8577855dd22580 100644 --- a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h @@ -15,6 +15,6 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h index 97159964d0540334ccdaa502bcfa3f8a9b06c059..4bca351422ff2e36ffa15a4cf25b85ea8cb20b9f 100644 --- a/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h index 78dcbac05c89694b9bd35ae443b66015a9983201..772204ae5d79c4826fea3082238ff43595c05ee0 100644 --- a/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next // Force B9 as input to align with qmk defaults #undef VAL_GPIOB_MODER diff --git a/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h index 8cb771bc12f9e4288a36b9931447ddd17a738c43..e8e43f1567dcc3aff651d71bbf2ac8a7a86feed8 100644 --- a/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h @@ -19,7 +19,7 @@ // The following is required to disable the pull-down on PA9, when PA9 is used for the keyboard matrix: #define BOARD_OTG_NOVBUSSENS -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h index 22c4e4cd7e692d0395f734325e9f8c3f38649ebe..a0d53d86e7c7ad513b5f4082b6c603adbab2d54d 100644 --- a/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h @@ -19,6 +19,6 @@ // The following is required to disable the pull-down on PA9, when PA9 is used for the keyboard matrix: #define BOARD_OTG_NOVBUSSENS -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS \ No newline at end of file diff --git a/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h index 30af6b0c8608281964074b542656b12271b42f9d..81c80b27731e406d3454783b4a8577855dd22580 100644 --- a/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h @@ -15,6 +15,6 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h index 80dfcffa991b09d1532a1b5befae2663a6f2814e..f05762c9b4d5a12510845f329b731252f5b1690f 100644 --- a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h @@ -19,6 +19,6 @@ // The following is required to disable the pull-down on PA9, when PA9 is used for the keyboard matrix: #define BOARD_OTG_NOVBUSSENS -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h index de5f85acdd99fab12275e4bb9b8e8a8ce47f58a1..1f7183f1e7a0f6d256ba257868b81e736b748a39 100644 --- a/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32L432xx #define STM32L422xx diff --git a/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h index 2e37d95fe39ad71c3a56376225062d970a9d91e8..1075f50cada85e579e793e5b90a8139414177eaf 100644 --- a/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h +++ b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32L432xx diff --git a/platforms/chibios/boards/QMK_PM2040/configs/board.h b/platforms/chibios/boards/QMK_PM2040/configs/board.h index 433e1c527fb65e2d992ce8e56e8819462cfa5f86..371c1a0dca86c65425846a6dd9d37c108a979d35 100644 --- a/platforms/chibios/boards/QMK_PM2040/configs/board.h +++ b/platforms/chibios/boards/QMK_PM2040/configs/board.h @@ -3,7 +3,7 @@ #pragma once -#include_next "board.h" +#include_next #undef BOARD_RP_PICO_RP2040 #define BOARD_PM2040 diff --git a/platforms/chibios/boards/QMK_PROTON_C/configs/board.h b/platforms/chibios/boards/QMK_PROTON_C/configs/board.h index 97159964d0540334ccdaa502bcfa3f8a9b06c059..4bca351422ff2e36ffa15a4cf25b85ea8cb20b9f 100644 --- a/platforms/chibios/boards/QMK_PROTON_C/configs/board.h +++ b/platforms/chibios/boards/QMK_PROTON_C/configs/board.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS diff --git a/platforms/chibios/boards/STEMCELL/configs/board.h b/platforms/chibios/boards/STEMCELL/configs/board.h index 39cf79ab09490b3e597c579a4f98611261fd1c81..33464e7eb8e542e8a0f0672abc50f1c704308c88 100644 --- a/platforms/chibios/boards/STEMCELL/configs/board.h +++ b/platforms/chibios/boards/STEMCELL/configs/board.h @@ -3,6 +3,6 @@ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSE_BYPASS