From 327f7ee9a74f1740106d46e65e909208a1372ad3 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 19 Jan 2023 12:05:29 +1100 Subject: Fixup ChibiOS header inclusion search ordering. (#19623) * Add STM32F446-Nucleo onekey. * Fixup onekey build for F446, all keymaps. * Fixup board inclusion search ordering. --- .../dactyl_manuform/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 +- keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h | 2 +- keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h | 2 +- .../handwired/onekey/keymaps/default/keymap.c | 2 ++ keyboards/handwired/onekey/nucleo_f446re/board.h | 9 +++++++++ keyboards/handwired/onekey/nucleo_f446re/config.h | 16 +++++++++++++++ keyboards/handwired/onekey/nucleo_f446re/halconf.h | 10 ++++++++++ keyboards/handwired/onekey/nucleo_f446re/info.json | 15 ++++++++++++++ keyboards/handwired/onekey/nucleo_f446re/mcuconf.h | 23 ++++++++++++++++++++++ keyboards/handwired/onekey/nucleo_f446re/readme.md | 5 +++++ keyboards/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 +- 23 files changed, 96 insertions(+), 15 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 (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h index b8bb363d91..f1a02293fd 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 e62fb3341e..94fa17b950 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 fcb7d84f96..f69da38b27 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 fcb7d84f96..f69da38b27 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 fcb7d84f96..f69da38b27 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 fcb7d84f96..f69da38b27 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 7ef36ff66c..322282b4b3 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 7ef36ff66c..322282b4b3 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 a5782f7a13..1c0375e56c 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 0000000000..0c5f4dde79 --- /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 0000000000..612cbf0eab --- /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 0000000000..e3fd1cf6e1 --- /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 0000000000..6b9206f987 --- /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 0000000000..701d61d31d --- /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 0000000000..c7d13cb973 --- /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 0000000000..8515c3fae0 --- /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 935056eb6a..5bf9e0544b 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 5c2587395d..e24a0d4f24 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 a8b0a56602..ab89514fb1 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 a8b0a56602..ab89514fb1 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 5525a077d2..12add21a0a 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 fd71b54b77..d3a21f72c4 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 24fb0ef3a5..437f957fa6 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 -- cgit v1.2.3