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 3439c90d524..bf2d83997cb 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 0e5caa9f9a9..c43f84e0de2 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 3b9c9056f8c..46b3b42f8b8 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 9c409670155..3defeed4dd6 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 0fdd67c3a29..6aaf31428c1 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 0fdd67c3a29..6aaf31428c1 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 78885b68708..1ba700a80fa 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 7adcb837deb..e4cde4880be 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 0fdd67c3a29..6aaf31428c1 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 0fdd67c3a29..6aaf31428c1 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 0e5caa9f9a9..c43f84e0de2 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 3b9c9056f8c..46b3b42f8b8 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 3a23d5f3707..0541043c538 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 0fdd67c3a29..6aaf31428c1 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 0fdd67c3a29..6aaf31428c1 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 7a79bec953f..57d15376d63 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 b54d705b542..81821c159dc 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 135994a43cb..906bd651978 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 f9aa8946657..f194dd225ce 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 a4c25c090a2..2e098f5113d 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 5e47eac54f9..c748d941e9a 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 a3774605a8f..b79b0f9e886 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 f9aa8946657..f194dd225ce 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 1664802d6c8..68ccc528d63 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 7f0840c7a7d..c92e5035a84 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 1664802d6c8..68ccc528d63 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 7f0840c7a7d..c92e5035a84 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 fc227f69b19..5de178fa61c 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 b780a0e77b2..f826479adf3 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 b8bb363d912..f1a02293fd0 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 e62fb3341ea..94fa17b9504 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 fcb7d84f969..f69da38b271 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 fcb7d84f969..f69da38b271 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 fcb7d84f969..f69da38b271 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 fcb7d84f969..f69da38b271 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 7ef36ff66c7..322282b4b3c 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 7ef36ff66c7..322282b4b3c 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 a5782f7a136..1c0375e56cc 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 00000000000..0c5f4dde799 --- /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 00000000000..612cbf0eab0 --- /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 00000000000..e3fd1cf6e1a --- /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 00000000000..6b9206f9873 --- /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 00000000000..701d61d31de --- /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 00000000000..c7d13cb9738 --- /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 00000000000..8515c3fae02 --- /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 935056eb6a4..5bf9e0544b8 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 5c2587395d7..e24a0d4f24e 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 a8b0a56602c..ab89514fb1c 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 a8b0a56602c..ab89514fb1c 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 5525a077d27..12add21a0a2 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 fd71b54b77d..d3a21f72c4d 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 24fb0ef3a57..437f957fa65 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 a4c25c090a2..2e098f5113d 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 5e47eac54f9..c748d941e9a 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 e614a9dfa93..76250cb8962 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 e614a9dfa93..76250cb8962 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 d32319aacf0..156fcf1ee2f 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 04499470866..f6dc94d2db2 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 c1d45157c73..7968bd26da8 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 69f458a9377..032c853f4eb 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 44035e78272..7475b0990c6 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 dde67871cdd..540e708a6ee 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 d7c29fcf65b..20337afbb27 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 fbc4e7ca62e..f534faccaf1 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 b51bf6708e7..838a3bb69ee 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 7ca1d3d2431..8833e3d746f 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 7ca1d3d2431..8833e3d746f 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 8b5d373bc3e..ff40f7ec9d9 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 5379bd4a179..aadaac04493 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 d58807924a0..a70b65c879d 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 d83804babdf..e474f8ab33f 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 d83804babdf..e474f8ab33f 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 a667bee461b..49270b36a05 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 d83804babdf..e474f8ab33f 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 8a068cd8831..aaa6d1e5f4c 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 a667bee461b..49270b36a05 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 d83804babdf..e474f8ab33f 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 d83804babdf..e474f8ab33f 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 d83804babdf..e474f8ab33f 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 0723a9c6b5e..b33982f7e66 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 8a068cd8831..aaa6d1e5f4c 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 9dbc78b9730..1e277d357dd 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 c67809a697d..897a6c4c0d0 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 78dcbac05c8..772204ae5d7 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 30af6b0c860..81c80b27731 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 f1ee51c91f5..372b9bb8bc3 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 b4363595d01..f0e95958965 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 052050c9449..89f4f0d61cd 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 30af6b0c860..81c80b27731 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 97159964d05..4bca351422f 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 78dcbac05c8..772204ae5d7 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 8cb771bc12f..e8e43f1567d 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 22c4e4cd7e6..a0d53d86e7c 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 30af6b0c860..81c80b27731 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 80dfcffa991..f05762c9b4d 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 de5f85acdd9..1f7183f1e7a 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 2e37d95fe39..1075f50cada 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 433e1c527fb..371c1a0dca8 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 97159964d05..4bca351422f 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 39cf79ab094..33464e7eb8e 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