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 #19375 #19376 #19377

Browse Source 
19375: tools/renode: add support for target reset r=benpicco a=aabadie



19376: boards/stm32f4discovery: use default port to access stdio via cdc acm r=benpicco a=aabadie



19377: pkg/tinyusb: fix default VID/PID configuration r=benpicco a=gschorcht

### Contribution description

This PR fixes the default VID/PID configuration if tinyUSB board reset feature is used.

While reviewing PR #19086 I was wondering why `esp32s2-wemos-mini` requires to set `USB_VID`/`USB_PID` explicitly to  `USB_VID_TESTING`/`USB_PID_TESTING`. The reason was that tinyUSB board reset feature wasn't declared as RIOT internal.

### Testing procedure

Flashing `esp32s2-wemos-mini` should still work.
```
BOARD=esp32s2-wemos-mini make -C tests/shell flash
```
The VID/PID should be `1209:7d00` and not `1209:7d01`.

### Issues/PRs references



Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>
Co-authored-by: Gunar Schorcht <gunar@schorcht.net>
This commit is contained in:
bors[bot] 2023-03-10 12:12:45 +00:00 committed by GitHub
commit 8c2391786c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/esp32s2-wemos-mini/Makefile.include
View File

@ -1,8 +1,5 @@
PORT_LINUX ?= /dev/ttyACM0
USB_VID ?= $(USB_VID_TESTING)
USB_PID ?= $(USB_PID_TESTING)
CFLAGS += -DCONFIG_CONSOLE_UART_TX=39
CFLAGS += -DCONFIG_CONSOLE_UART_RX=37

4
boards/stm32f4discovery/Makefile.include
View File

@ -1,10 +1,6 @@
# we use shared STM32 configuration snippets
INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# set default port depending on operating system
PORT_LINUX ?= /dev/ttyUSB0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses openocd with st-link
PROGRAMMER ?= openocd
OPENOCD_DEBUG_ADAPTER ?= stlink

8
makefiles/tools/renode.inc.mk
View File

@ -27,6 +27,11 @@ endif
RENODE_LOG_LEVEL ?= 2 # Warning level
RENODE_CONFIG_FLAGS += -e "logLevel $(RENODE_LOG_LEVEL)"
# Configure renode telnet port to allow sending command to the monitor while
# the emulator is running (used to send reset command)
RENODE_TELNET_PORT ?= 1234
RENODE_CONFIG_FLAGS += -P $(RENODE_TELNET_PORT)
# Renode GUI
RENODE_SHOW_GUI ?= 0
ifneq (1,$(RENODE_SHOW_GUI))
@ -62,6 +67,9 @@ DEBUGSERVER_FLAGS ?= $(RENODE_DEBUG_FLAGS)
DEBUGGER_FLAGS ?= $(BOARD) $(APPDIR) $(DEBUG_ELFFILE) $(GDB_REMOTE) $(EMULATOR_TMP_DIR) "-ex \"monitor start\""
DEBUGGER ?= $(RIOTTOOLS)/emulator/debug.sh
RESET ?= bash
RESET_FLAGS ?= -c "{ sleep 0.2;echo machine RequestReset; } | telnet localhost $(RENODE_TELNET_PORT)" || true
# No flasher available with renode emulator
FLASHER ?=
FFLAGS ?=

2
pkg/tinyusb/contrib/tinyusb_board_reset.c
View File

@ -8,6 +8,8 @@
#if MODULE_TINYUSB_DEVICE && MODULE_TINYUSB_CLASS_CDC && MODULE_USB_BOARD_RESET
#define USB_H_USER_IS_RIOT_INTERNAL
#include "usb_board_reset_internal.h"
#include "class/cdc/cdc.h"