diff options
author | QMK Bot <[email protected]> | 2023-01-19 01:06:08 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2023-01-19 01:06:08 +0000 |
commit | 3723c0e3d57f0afdff0e1b7421d26d6c7f6c980d (patch) | |
tree | ff40347d0912e988e6fca4762b88159ca4987206 /keyboards | |
parent | 0b25528b6bc433e8609d4e12fb108b4ee7865197 (diff) | |
parent | 327f7ee9a74f1740106d46e65e909208a1372ad3 (diff) | |
download | qmk_firmware-3723c0e3d57f0afdff0e1b7421d26d6c7f6c980d.tar.gz qmk_firmware-3723c0e3d57f0afdff0e1b7421d26d6c7f6c980d.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
81 files changed, 154 insertions, 73 deletions
diff --git a/keyboards/akb/vero/mcuconf.h b/keyboards/akb/vero/mcuconf.h index 3439c90d52..bf2d83997c 100644 --- a/keyboards/akb/vero/mcuconf.h +++ b/keyboards/akb/vero/mcuconf.h @@ -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 diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h index 0e5caa9f9a..c43f84e0de 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 <halconf.h> diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h index 3b9c9056f8..46b3b42f8b 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 <mcuconf.h> #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 9c40967015..3defeed4dd 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 <mcuconf.h> #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 0fdd67c3a2..6aaf31428c 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 <mcuconf.h> #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 0fdd67c3a2..6aaf31428c 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 <mcuconf.h> #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 78885b6870..1ba700a80f 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 <halconf.h> diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h index 7adcb837de..e4cde4880b 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 <mcuconf.h> #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 0fdd67c3a2..6aaf31428c 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 <mcuconf.h> #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 0fdd67c3a2..6aaf31428c 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 <mcuconf.h> #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 0e5caa9f9a..c43f84e0de 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 <halconf.h> diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h index 3b9c9056f8..46b3b42f8b 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 <mcuconf.h> #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 3a23d5f370..0541043c53 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 <mcuconf.h> #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 0fdd67c3a2..6aaf31428c 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 <mcuconf.h> #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 0fdd67c3a2..6aaf31428c 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 <mcuconf.h> #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 7a79bec953..57d15376d6 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 <halconf.h> diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h index b54d705b54..81821c159d 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 <mcuconf.h> #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 135994a43c..906bd65197 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 <halconf.h> diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h index f9aa894665..f194dd225c 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 <mcuconf.h> #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 a4c25c090a..2e098f5113 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 <halconf.h> diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h index 5e47eac54f..c748d941e9 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 <mcuconf.h> #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 a3774605a8..b79b0f9e88 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 <halconf.h> diff --git a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h index f9aa894665..f194dd225c 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 <mcuconf.h> #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 1664802d6c..68ccc528d6 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 <halconf.h> diff --git a/keyboards/controllerworks/mini36/mcuconf.h b/keyboards/controllerworks/mini36/mcuconf.h index 7f0840c7a7..c92e5035a8 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 <mcuconf.h> #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 1664802d6c..68ccc528d6 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 <halconf.h> diff --git a/keyboards/controllerworks/mini42/mcuconf.h b/keyboards/controllerworks/mini42/mcuconf.h index 7f0840c7a7..c92e5035a8 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 <mcuconf.h> #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 fc227f69b1..5de178fa61 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000U diff --git a/keyboards/halokeys/elemental75/chconf.h b/keyboards/halokeys/elemental75/chconf.h index b780a0e77b..f826479adf 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 <chconf.h> 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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <board.h> + +#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 <halconf.h> 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 <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 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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 <mcuconf.h> #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 a4c25c090a..2e098f5113 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 <halconf.h> diff --git a/keyboards/keebio/sinc/rev3/mcuconf.h b/keyboards/keebio/sinc/rev3/mcuconf.h index 5e47eac54f..c748d941e9 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 <mcuconf.h> #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 e614a9dfa9..76250cb896 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 <mcuconf.h> #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 e614a9dfa9..76250cb896 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 <mcuconf.h> #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 d32319aacf..156fcf1ee2 100644 --- a/keyboards/linworks/whale75/chconf.h +++ b/keyboards/linworks/whale75/chconf.h @@ -14,4 +14,4 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include_next "chconf.h" +#include_next <chconf.h> diff --git a/keyboards/linworks/whale75/mcuconf.h b/keyboards/linworks/whale75/mcuconf.h index 0449947086..f6dc94d2db 100644 --- a/keyboards/linworks/whale75/mcuconf.h +++ b/keyboards/linworks/whale75/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include_next "mcuconf.h" +#include_next <mcuconf.h> // 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 c1d45157c7..7968bd26da 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 <mcuconf.h> #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 69f458a937..032c853f4e 100644 --- a/keyboards/moonlander/mcuconf.h +++ b/keyboards/moonlander/mcuconf.h @@ -16,7 +16,7 @@ #pragma once -#include_next "mcuconf.h" +#include_next <mcuconf.h> // 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 44035e7827..7475b0990c 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 <mcuconf.h> // 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 dde67871cd..540e708a6e 100644 --- a/keyboards/planck/rev6/mcuconf.h +++ b/keyboards/planck/rev6/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include_next "mcuconf.h" +#include_next <mcuconf.h> // 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 d7c29fcf65..20337afbb2 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 <http://www.gnu.org/licenses/>. */ -#include_next "mcuconf.h" +#include_next <mcuconf.h> // 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 fbc4e7ca62..f534faccaf 100644 --- a/keyboards/preonic/rev3/mcuconf.h +++ b/keyboards/preonic/rev3/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include_next "mcuconf.h" +#include_next <mcuconf.h> // 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 b51bf6708e..838a3bb69e 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 <http://www.gnu.org/licenses/>. */ -#include_next "mcuconf.h" +#include_next <mcuconf.h> // 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 7ca1d3d243..8833e3d746 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 <chconf.h> diff --git a/keyboards/splitkb/kyria/rev2/proton_c/chconf.h b/keyboards/splitkb/kyria/rev2/proton_c/chconf.h index 7ca1d3d243..8833e3d746 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 <chconf.h> diff --git a/keyboards/teleport/native/mcuconf.h b/keyboards/teleport/native/mcuconf.h index 8b5d373bc3..ff40f7ec9d 100644 --- a/keyboards/teleport/native/mcuconf.h +++ b/keyboards/teleport/native/mcuconf.h @@ -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 diff --git a/keyboards/tzarc/ghoul/rev1/stm32/board.h b/keyboards/tzarc/ghoul/rev1/stm32/board.h index 5379bd4a17..aadaac0449 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 <board.h> #ifdef BOARD_OTG_NOVBUSSENS # undef BOARD_OTG_NOVBUSSENS diff --git a/keyboards/weirdo/geminate60/chconf.h b/keyboards/weirdo/geminate60/chconf.h index d58807924a..a70b65c879 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 <chconf.h> diff --git a/keyboards/yandrstudio/buff67v3/board.h b/keyboards/yandrstudio/buff67v3/board.h index d83804babd..e474f8ab33 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/eau87/board.h b/keyboards/yandrstudio/eau87/board.h index d83804babd..e474f8ab33 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/eau_r2/board.h b/keyboards/yandrstudio/eau_r2/board.h index a667bee461..49270b36a0 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/nightstar75/board.h b/keyboards/yandrstudio/nightstar75/board.h index d83804babd..e474f8ab33 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/nz64/board.h b/keyboards/yandrstudio/nz64/board.h index 8a068cd883..aaa6d1e5f4 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/nz67v2/board.h b/keyboards/yandrstudio/nz67v2/board.h index a667bee461..49270b36a0 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/tg67/board.h b/keyboards/yandrstudio/tg67/board.h index d83804babd..e474f8ab33 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/wave75/board.h b/keyboards/yandrstudio/wave75/board.h index d83804babd..e474f8ab33 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/yr6095/board.h b/keyboards/yandrstudio/yr6095/board.h index d83804babd..e474f8ab33 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/yr80/board.h b/keyboards/yandrstudio/yr80/board.h index 0723a9c6b5..b33982f7e6 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 diff --git a/keyboards/yandrstudio/zhou65/board.h b/keyboards/yandrstudio/zhou65/board.h index 8a068cd883..aaa6d1e5f4 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 <board.h> #undef STM32_HSECLK #define STM32_HSECLK 16000000 |