mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-25 12:46:41 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
QMK Bot
commit
d5d168c081
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -19,4 +19,4 @@
|
||||
|
||||
#define HAL_USE_SPI TRUE
|
||||
|
||||
#include_next "halconf.h"
|
||||
#include_next <halconf.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
|
||||
|
||||
@ -20,4 +20,4 @@
|
||||
#define HAL_USE_SPI TRUE
|
||||
#define HAL_USE_I2C TRUE
|
||||
|
||||
#include_next "halconf.h"
|
||||
#include_next <halconf.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
|
||||
|
||||
@ -18,4 +18,4 @@
|
||||
|
||||
#define HAL_USE_I2C TRUE
|
||||
|
||||
#include_next "halconf.h"
|
||||
#include_next <halconf.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
|
||||
|
||||
@ -20,4 +20,4 @@
|
||||
#define HAL_USE_I2C TRUE
|
||||
#define HAL_USE_SPI TRUE
|
||||
|
||||
#include_next "halconf.h"
|
||||
#include_next <halconf.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
|
||||
|
||||
@ -19,4 +19,4 @@
|
||||
|
||||
#define HAL_USE_I2C TRUE
|
||||
|
||||
#include_next "halconf.h"
|
||||
#include_next <halconf.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
|
||||
@ -19,4 +19,4 @@
|
||||
|
||||
#define HAL_USE_I2C TRUE
|
||||
|
||||
#include_next "halconf.h"
|
||||
#include_next <halconf.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
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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] = {
|
||||
|
||||
9
keyboards/handwired/onekey/nucleo_f446re/board.h
Normal file
9
keyboards/handwired/onekey/nucleo_f446re/board.h
Normal file
@ -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
keyboards/handwired/onekey/nucleo_f446re/config.h
Normal file
16
keyboards/handwired/onekey/nucleo_f446re/config.h
Normal file
@ -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
keyboards/handwired/onekey/nucleo_f446re/halconf.h
Normal file
10
keyboards/handwired/onekey/nucleo_f446re/halconf.h
Normal file
@ -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
keyboards/handwired/onekey/nucleo_f446re/info.json
Normal file
15
keyboards/handwired/onekey/nucleo_f446re/info.json
Normal file
@ -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
keyboards/handwired/onekey/nucleo_f446re/mcuconf.h
Normal file
23
keyboards/handwired/onekey/nucleo_f446re/mcuconf.h
Normal file
@ -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
keyboards/handwired/onekey/nucleo_f446re/readme.md
Normal file
5
keyboards/handwired/onekey/nucleo_f446re/readme.md
Normal file
@ -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
keyboards/handwired/onekey/nucleo_f446re/rules.mk
Normal file
1
keyboards/handwired/onekey/nucleo_f446re/rules.mk
Normal file
@ -0,0 +1 @@
|
||||
SRC += analog.c
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -18,4 +18,4 @@
|
||||
|
||||
#define HAL_USE_I2C TRUE
|
||||
|
||||
#include_next "halconf.h"
|
||||
#include_next <halconf.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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -14,4 +14,4 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include_next "chconf.h"
|
||||
#include_next <chconf.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
|
||||
|
||||
@ -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
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "mcuconf.h"
|
||||
#include_next <mcuconf.h>
|
||||
|
||||
// for i2c expander, and ISSI
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "mcuconf.h"
|
||||
#include_next <mcuconf.h>
|
||||
|
||||
// for i2c expander, and ISSI
|
||||
#undef STM32_I2C_USE_I2C1
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -19,4 +19,4 @@
|
||||
#define CH_CFG_ST_RESOLUTION 16
|
||||
#define CH_CFG_ST_FREQUENCY 10000
|
||||
|
||||
#include_next "chconf.h"
|
||||
#include_next <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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSECLK
|
||||
#define STM32_HSECLK 16000000
|
||||
|
||||
@ -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 <chconf.h>
|
||||
#endif
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
// Force B9 as input to align with qmk defaults
|
||||
#undef VAL_GPIOB_MODER
|
||||
|
||||
@ -15,6 +15,6 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
@ -15,6 +15,6 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef BOARD_RP_PICO_RP2040
|
||||
#define BOARD_GENERIC_PROMICRO_RP2040
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef BOARD_RP_PICO_RP2040
|
||||
#define BOARD_GENERIC_RP2040
|
||||
|
||||
@ -15,6 +15,6 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
// Force B9 as input to align with qmk defaults
|
||||
#undef VAL_GPIOB_MODER
|
||||
|
||||
@ -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 <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
|
||||
@ -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 <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
@ -15,6 +15,6 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
@ -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 <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32L432xx
|
||||
#define STM32L422xx
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32L432xx
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef BOARD_RP_PICO_RP2040
|
||||
#define BOARD_PM2040
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next "board.h"
|
||||
#include_next <board.h>
|
||||
|
||||
#undef STM32_HSE_BYPASS
|
||||
|
||||
Loading…
Reference in New Issue
Block a user