kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-22 04:53:50 +01:00
Code Releases Activity

Merge #19287

Browse Source 
19287: boards/esp32s2-lilygo-ttgo-t8: fix STDIO selection in Kconfig r=benpicco a=gschorcht

### Contribution description

This PR fixes the default STDIO selection in Kconfig in case the USB port is connected to the USB to UART bridge which is then used for STDIO (default). It solves the compilation problems in the nightly build.

The PR also includes a very small documentation fix.

### Testing procedure

Green CI.

The compilations that caused problems  in nightly build should pass:
```
python3 dist/tools/compile_test/compile_like_murdock.py -a tests/pkg_tinyusb_cdc_msc -b  esp32s2-lilygo-ttgo-t8 -j8
```
```
python3 dist/tools/compile_test/compile_like_murdock.py -a tests/sys_fido2_ctap/ -b  esp32s2-lilygo-ttgo-t8 -j8
```
```
python3 dist/tools/compile_test/compile_like_murdock.py -a tests/usbus_board_reset/ -b  esp32s2-lilygo-ttgo-t8 -j8
```

### Issues/PRs references


Co-authored-by: Gunar Schorcht <gunar@schorcht.net>
This commit is contained in:
bors[bot] 2023-02-18 15:55:38 +00:00 committed by GitHub
commit 3917c29977
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/esp32s2-lilygo-ttgo-t8/Kconfig
View File

@ -28,7 +28,7 @@ config BOARD_ESP32S2_LILYGO_TTGO_T8
select HAVE_MTD_SDCARD_DEFAULT select HAVE_MTD_SDCARD_DEFAULT
select HAVE_ST7735 select HAVE_ST7735
select MODULE_FATFS_VFS if MODULE_VFS_DEFAULT select MODULE_FATFS_VFS if MODULE_VFS_DEFAULT
select MODULE_USBUS_CDC_ACM if MODULE_USBUS select MODULE_USBUS_CDC_ACM if MODULE_USBUS && ESP32S2_LILYGO_TTGO_T8_USB
menu "LILYGO TTGO T8 ESP32-S2 Board configurations" menu "LILYGO TTGO T8 ESP32-S2 Board configurations"
depends on BOARD_ESP32S2_LILYGO_TTGO_T8 depends on BOARD_ESP32S2_LILYGO_TTGO_T8
@ -54,8 +54,8 @@ menu "LILYGO TTGO T8 ESP32-S2 Board configurations"
endmenu endmenu
choice STDIO_IMPLEMENTATION choice STDIO_IMPLEMENTATION
default MODULE_STDIO_CDC_ACM if MODULE_USBUS default MODULE_STDIO_CDC_ACM if MODULE_USBUS && ESP32S2_LILYGO_TTGO_T8_USB
default MODULE_STDIO_TINYUSB_CDC_ACM if MODULE_TINYUSB_DEVICE default MODULE_STDIO_TINYUSB_CDC_ACM if MODULE_TINYUSB_DEVICE && ESP32S2_LILYGO_TTGO_T8_USB
endchoice endchoice
source "$(RIOTBOARD)/common/esp32s2/Kconfig" source "$(RIOTBOARD)/common/esp32s2/Kconfig"

8
boards/esp32s2-lilygo-ttgo-t8/doc.txt
View File

@ -72,11 +72,11 @@ can also be used by other devices.
The LILYGO TTGO T8 ESP32-S2 has a USB-to-UART bridge on board. The USB D-/D+ The LILYGO TTGO T8 ESP32-S2 has a USB-to-UART bridge on board. The USB D-/D+
signals of the USB-C connector are connected via DIP switches either to this signals of the USB-C connector are connected via DIP switches either to this
USB-to-UART bridge (default) or to GPIO19/GPIO20 of the ESP32-S2. To use the USB-to-UART bridge (default) or to GPIO19/GPIO20 of the ESP32-S2. To use the
USB-OTG interface of the ESP32-S2, the USB D-/D+ signals must be connected to USB OTG interface of the ESP32-S2, the USB D-/D+ signals must be connected to
GPIO19 and GPIO20, see section \ref esp32s2_lilygo_ttgo_t8_pinout "Pinout". GPIO19 and GPIO20, see section \ref esp32s2_lilygo_ttgo_t8_pinout "Pinout".
If the USB-to-UART bridge is used, module `stdio_cdc_acm` or module To use the USB OTG interface also for the console in this case, either the
`stdio_tinyusb_cdc_acm` can be enabled to use the USB interface also for the `stdio_cdc_acm` or the `stdio_tinyusb_cdc_acm` module must be enabled.
console. This is automatically the case if the USBUS or tinyUSB stack is used.
The LILYGO TTGO T8 ESP32-S2 has a 32.768 kHz crystal on the board, which is The LILYGO TTGO T8 ESP32-S2 has a 32.768 kHz crystal on the board, which is
connected to GPIO15 and GPIO16 via DIP switches (default). The crystal can connected to GPIO15 and GPIO16 via DIP switches (default). The crystal can