RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge #19259

Browse Source 
19259: boards/stm32f4discovery: default to stdio via CDC ACM r=benpicco a=benpicco



Co-authored-by: Benjamin Valentin <benjamin.valentin@bht-berlin.de>
This commit is contained in:
bors[bot] 2023-02-10 10:42:56 +00:00 committed by GitHub
commit d145a876ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
boards/stm32f4discovery/Kconfig
View File

@ -28,12 +28,21 @@ config BOARD_STM32F4DISCOVERY
# Various other features (if any) # Various other features (if any)
select HAS_ARDUINO select HAS_ARDUINO
select HAS_TINYUSB_DEVICE select HAS_TINYUSB_DEVICE
select HAS_HIGHLEVEL_STDIO
# Clock configuration # Clock configuration
select BOARD_HAS_HSE select BOARD_HAS_HSE
select HAVE_SAUL_GPIO select HAVE_SAUL_GPIO
select MODULE_USBUS if TEST_KCONFIG && !PACKAGE_TINYUSB
select MODULE_USBUS_CDC_ACM if TEST_KCONFIG && !PACKAGE_TINYUSB
choice STDIO_IMPLEMENTATION
default MODULE_STDIO_CDC_ACM if MODULE_USBUS
default MODULE_STDIO_TINYUSB_CDC_ACM if PACKAGE_TINYUSB
endchoice
source "$(RIOTBOARD)/common/stm32/Kconfig" source "$(RIOTBOARD)/common/stm32/Kconfig"
config ERROR_MODULES_CONFLICT config ERROR_MODULES_CONFLICT

2
boards/stm32f4discovery/Makefile.dep
View File

@ -1,3 +1,5 @@
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio USEMODULE += saul_gpio
endif endif
include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk

2
boards/stm32f4discovery/Makefile.features
View File

@ -17,6 +17,8 @@ FEATURES_PROVIDED += periph_usbdev
FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino
FEATURES_PROVIDED += tinyusb_device FEATURES_PROVIDED += tinyusb_device
FEATURES_PROVIDED += highlevel_stdio
# TODO: re-think concept for conflicts based on actual used peripherals... # TODO: re-think concept for conflicts based on actual used peripherals...
FEATURES_CONFLICT += periph_spi:periph_dac FEATURES_CONFLICT += periph_spi:periph_dac
FEATURES_CONFLICT_MSG += "On stm32f4discovery boards there are the same pins for the DAC and/or SPI_0." FEATURES_CONFLICT_MSG += "On stm32f4discovery boards there are the same pins for the DAC and/or SPI_0."

4
boards/stm32f4discovery/doc.txt
View File

@ -58,7 +58,11 @@ arbitrary and can be altered by editing the
LEDs LD7 and LD8 are used by the USB connector for over-current (LD8) and LEDs LD7 and LD8 are used by the USB connector for over-current (LD8) and
data (LD7) indication. data (LD7) indication.
### USB Device Interface
The board has a micro USB port that can be used for USB device mode.
As the ST-Link on the board does not provide a USB-UART interface, the STDIO is
mapped to the micro USB port by default (via CDC ACM).
### Accelerometer ### Accelerometer

1
tests/xtimer_now32_overflow/Makefile
View File

@ -14,6 +14,7 @@ BOARD_BLACKLIST += \
pinetime \ pinetime \
ruuvitag \ ruuvitag \
stm32f429i-disco \ stm32f429i-disco \
stm32f4discovery \
thingy52 \ thingy52 \
waspmote-pro \ waspmote-pro \
weact-f401cc \ weact-f401cc \

1
tests/xtimer_now64_continuity/Makefile
View File

@ -15,6 +15,7 @@ BOARD_BLACKLIST += \
pinetime \ pinetime \
ruuvitag \ ruuvitag \
stm32f429i-disco \ stm32f429i-disco \
stm32f4discovery \
thingy52 \ thingy52 \
waspmote-pro \ waspmote-pro \
weact-f401cc \ weact-f401cc \