Skip to content

Commit

Permalink
Fixup ChibiOS header inclusion search ordering. (#19623)
Browse files Browse the repository at this point in the history 
* Add STM32F446-Nucleo onekey. 

* Fixup onekey build for F446, all keymaps.

* Fixup board inclusion search ordering.
  • Loading branch information
@tzarc
tzarc authored Jan 19, 2023
1 parent 17c9388 commit 327f7ee
Show file tree
Hide file tree
Showing 100 changed files with 195 additions and 91 deletions.
2 changes: 1 addition & 1 deletion keyboards/akb/vero/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include_next "mcuconf.h"
#include_next <mcuconf.h>
/* 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
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
#define SPI_USE_WAIT TRUE
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
# undef STM32_I2C_USE_I2C1
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
#define SPI_USE_WAIT TRUE
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
#define SPI_USE_WAIT TRUE
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
# undef STM32_PWM_USE_ADVANCED
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

#define HAL_USE_SPI TRUE

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI1
#define RP_SPI_USE_SPI1 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
#define HAL_USE_SPI TRUE
#define HAL_USE_I2C TRUE

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI1
#define RP_SPI_USE_SPI1 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

#define HAL_USE_I2C TRUE

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_I2C_USE_I2C1
#define RP_I2C_USE_I2C1 TRUE
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_3/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
#define HAL_USE_I2C TRUE
#define HAL_USE_SPI TRUE

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_SPI_USE_SPI1
#define RP_SPI_USE_SPI1 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/controllerworks/mini36/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

#define HAL_USE_I2C TRUE

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/controllerworks/mini36/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_I2C_USE_I2C0
#define RP_I2C_USE_I2C0 TRUE
2 changes: 1 addition & 1 deletion keyboards/controllerworks/mini42/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

#define HAL_USE_I2C TRUE

#include_next "halconf.h"
#include_next <halconf.h>
2 changes: 1 addition & 1 deletion keyboards/controllerworks/mini42/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef RP_I2C_USE_I2C0
#define RP_I2C_USE_I2C0 TRUE
2 changes: 1 addition & 1 deletion keyboards/drop/sense75/board.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include_next "board.h"
#include_next <board.h>

#undef STM32_HSECLK
#define STM32_HSECLK 16000000U
2 changes: 1 addition & 1 deletion keyboards/halokeys/elemental75/chconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <chconf.h>
2 changes: 1 addition & 1 deletion keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_SERIAL_USE_USART1
#define STM32_SERIAL_USE_USART1 TRUE
2 changes: 1 addition & 1 deletion keyboards/handwired/macroboard/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/onekey/blackpill_f401/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_ADC_USE_ADC1
#define STM32_ADC_USE_ADC1 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_ADC_USE_ADC1
#define STM32_ADC_USE_ADC1 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/onekey/blackpill_f411/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_ADC_USE_ADC1
#define STM32_ADC_USE_ADC1 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef STM32_ADC_USE_ADC1
#define STM32_ADC_USE_ADC1 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef WB32_ADC_USE_ADC1
#define WB32_ADC_USE_ADC1 TRUE
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

#undef WB32_ADC_USE_ADC1
#define WB32_ADC_USE_ADC1 TRUE
Expand Down
2 changes: 2 additions & 0 deletions keyboards/handwired/onekey/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -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] = {
Expand Down
9 changes: 9 additions & 0 deletions keyboards/handwired/onekey/nucleo_f446re/board.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright 2023 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include_next <board.h>

#undef STM32_HSECLK
#define STM32_HSECLK 8000000U
#define STM32_HSE_BYPASS
16 changes: 16 additions & 0 deletions keyboards/handwired/onekey/nucleo_f446re/config.h
View file
Original file line number Diff line number Diff line change
@@ -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 }
10 changes: 10 additions & 0 deletions keyboards/handwired/onekey/nucleo_f446re/halconf.h
View file
Original file line number Diff line number Diff line change
@@ -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 <halconf.h>
15 changes: 15 additions & 0 deletions keyboards/handwired/onekey/nucleo_f446re/info.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
23 changes: 23 additions & 0 deletions keyboards/handwired/onekey/nucleo_f446re/mcuconf.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2023 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include_next <mcuconf.h>

#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
5 changes: 5 additions & 0 deletions keyboards/handwired/onekey/nucleo_f446re/readme.md
View file
Original file line number Diff line number Diff line change
@@ -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`.
1 change: 1 addition & 0 deletions keyboards/handwired/onekey/nucleo_f446re/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SRC += analog.c
Loading

0 comments on commit 327f7ee

Please sign in to comment.