varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2024-03-02 18:20:47 +00:00
parent 569b0c70be 092ef661af
commit 73c4ca175b
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platforms/chibios/chibios_config.h
View file

@ -108,6 +108,11 @@
# if defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(STM32L1XX) # if defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(STM32L1XX)
# define USE_I2CV1 # define USE_I2CV1
# endif # endif
# if defined(STM32G0XX) || defined(STM32G4XX) || defined(STM32L5XX) || defined(STM32H7XX)
# define USE_USARTV3
# endif
#endif #endif
// GD32 compatibility // GD32 compatibility

2
platforms/chibios/drivers/uart_sio.c
View file

@ -16,7 +16,7 @@ static SIOConfig sioConfig = {
#else #else
static SIOConfig sioConfig = { static SIOConfig sioConfig = {
.baud = SIO_DEFAULT_BITRATE, .baud = SIO_DEFAULT_BITRATE,
# if defined(MCU_STM32) && defined(CHIBIOS_HAL_USARTv3) # if defined(MCU_STM32) && defined(USE_USARTV3)
.presc = USART_PRESC1, .presc = USART_PRESC1,
# endif # endif
.cr1 = UART_CR1, .cr1 = UART_CR1,

11
platforms/chibios/platform.mk
View file

@ -329,17 +329,6 @@ ifeq ($(strip $(USE_CHIBIOS_CONTRIB)),yes)
EXTRAINCDIRS += $(PLATFORMINC_CONTRIB) $(HALINC_CONTRIB) $(CHIBIOS_CONTRIB)/os/various EXTRAINCDIRS += $(PLATFORMINC_CONTRIB) $(HALINC_CONTRIB) $(CHIBIOS_CONTRIB)/os/various
endif endif
#
# Extract supported HAL drivers
##############################################################################
define add_lld_driver_define
$(eval driver := $(word 2,$(subst /LLD/, ,$(1))))
$(eval OPT_DEFS += -DCHIBIOS_HAL_$(driver))
endef
$(foreach dir,$(EXTRAINCDIRS),$(if $(findstring /LLD/,$(dir)),$(call add_lld_driver_define,$(dir))))
# #
# Project, sources and paths # Project, sources and paths
############################################################################## ##############################################################################