mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-25 12:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #621 from hathach/rp2040-logger-enumfix

Browse Source 
Rp2040 logger and enum fix
This commit is contained in:
Ha Thach 2021-02-01 14:25:58 +07:00 committed by GitHub
commit 26caddae23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 97 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/audio_test/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/board_test/CMakeLists.txt
View File

@ -37,7 +37,7 @@ elseif(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/cdc_dual_ports/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/cdc_msc/CMakeLists.txt
View File

@ -39,7 +39,7 @@ elseif(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/dfu_rt/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/dynamic_configuration/CMakeLists.txt
View File

@ -34,7 +34,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/hid_composite/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/hid_generic_inout/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/hid_multiple_interface/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/midi_test/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/msc_dual_lun/CMakeLists.txt
View File

@ -34,7 +34,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/net_lwip_webserver/CMakeLists.txt
View File

@ -80,7 +80,7 @@ if(FAMILY STREQUAL "rp2040")
HTTPD_USE_CUSTOM_FSDATA=0 HTTPD_USE_CUSTOM_FSDATA=0
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/uac2_headset/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/usbtmc/CMakeLists.txt
View File

@ -34,7 +34,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

2
examples/device/webusb_serial/CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(FAMILY STREQUAL "rp2040")
CFG_TUSB_OS=OPT_OS_PICO CFG_TUSB_OS=OPT_OS_PICO
) )
target_link_libraries(${PROJECT} pico_stdlib) target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
pico_add_extra_outputs(${PROJECT}) pico_add_extra_outputs(${PROJECT})
else() else()

7
examples/make.mk
View File

@ -112,13 +112,18 @@ endif
# Log level is mapped to TUSB DEBUG option # Log level is mapped to TUSB DEBUG option
ifneq ($(LOG),) ifneq ($(LOG),)
CMAKE_DEFSYM += -DLOG=$(LOG)
CFLAGS += -DCFG_TUSB_DEBUG=$(LOG) CFLAGS += -DCFG_TUSB_DEBUG=$(LOG)
endif endif
# Logger: default is uart, can be set to rtt or swo # Logger: default is uart, can be set to rtt or swo
ifneq ($(LOGGER),)
CMAKE_DEFSYM += -DLOGGER=$(LOGGER)
endif
ifeq ($(LOGGER),rtt) ifeq ($(LOGGER),rtt)
RTT_SRC = lib/SEGGER_RTT
CFLAGS += -DLOGGER_RTT -DSEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL CFLAGS += -DLOGGER_RTT -DSEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
RTT_SRC = lib/SEGGER_RTT
INC += $(TOP)/$(RTT_SRC)/RTT INC += $(TOP)/$(RTT_SRC)/RTT
SRC_C += $(RTT_SRC)/RTT/SEGGER_RTT.c SRC_C += $(RTT_SRC)/RTT/SEGGER_RTT.c
else ifeq ($(LOGGER),swo) else ifeq ($(LOGGER),swo)

25
examples/rules.mk
View File

@ -11,30 +11,30 @@ ifeq ($(FAMILY),esp32s2)
.PHONY: all clean flash .PHONY: all clean flash
all: all:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) build idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) build
build: all build: all
clean: clean:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) clean idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) clean
fullclean: fullclean:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) fullclean idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) fullclean
flash: flash:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) flash idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) flash
bootloader-flash: bootloader-flash:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) bootloader-flash idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) bootloader-flash
app-flash: app-flash:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) app-flash idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) app-flash
erase: erase:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) erase_flash idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) erase_flash
monitor: monitor:
idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) monitor idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) monitor
UF2_FAMILY_ID = 0xbfdd4eee UF2_FAMILY_ID = 0xbfdd4eee
$(BUILD)/$(PROJECT).uf2: $(BUILD)/$(PROJECT).hex $(BUILD)/$(PROJECT).uf2: $(BUILD)/$(PROJECT).hex
@ -43,13 +43,18 @@ $(BUILD)/$(PROJECT).uf2: $(BUILD)/$(PROJECT).hex
else ifeq ($(FAMILY),rp2040) else ifeq ($(FAMILY),rp2040)
all: $(BUILD):
[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) -DPICO_BUILD_DOCS=0 cmake -S . -B $(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) -DPICO_BUILD_DOCS=0 $(CMAKE_DEFSYM)
all: $(BUILD)
$(MAKE) -C $(BUILD) $(MAKE) -C $(BUILD)
clean: clean:
$(RM) -rf $(BUILD) $(RM) -rf $(BUILD)
flash:
@$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2
else else
# GNU Make build system # GNU Make build system

40
hw/bsp/rp2040/family.c
View File

@ -76,6 +76,38 @@ bool __no_inline_not_in_flash_func(get_bootsel_button)() {
} }
#endif #endif
//------------- Segger RTT retarget -------------//
#if defined(LOGGER_RTT)
// Logging with RTT
#include "pico/stdio/driver.h"
#include "SEGGER_RTT.h"
static void stdio_rtt_write (const char *buf, int length)
{
SEGGER_RTT_Write(0, buf, length);
}
static int stdio_rtt_read (char *buf, int len)
{
return SEGGER_RTT_Read(0, buf, len);
}
static stdio_driver_t stdio_rtt =
{
.out_chars = stdio_rtt_write,
.out_flush = NULL,
.in_chars = stdio_rtt_read
};
void stdio_rtt_init(void)
{
stdio_set_driver_enabled(&stdio_rtt, true);
}
#endif
void board_init(void) void board_init(void)
{ {
gpio_init(LED_PIN); gpio_init(LED_PIN);
@ -86,9 +118,11 @@ void board_init(void)
#endif #endif
#ifdef UART_DEV #ifdef UART_DEV
uart_init(UART_DEV, CFG_BOARD_UART_BAUDRATE); stdio_uart_init_full(UART_DEV, CFG_BOARD_UART_BAUDRATE, UART_TX_PIN, UART_RX_PIN);
gpio_set_function(UART_TX_PIN, GPIO_FUNC_UART); #endif
gpio_set_function(UART_RX_PIN, GPIO_FUNC_UART);
#if defined(LOGGER_RTT)
stdio_rtt_init();
#endif #endif
// todo probably set up device mode? // todo probably set up device mode?

24
hw/bsp/rp2040/family.cmake
View File

@ -30,4 +30,28 @@ target_include_directories(${PROJECT} PUBLIC
target_compile_definitions(${PROJECT} PUBLIC target_compile_definitions(${PROJECT} PUBLIC
CFG_TUSB_MCU=OPT_MCU_RP2040 CFG_TUSB_MCU=OPT_MCU_RP2040
PICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1
) )
if(DEFINED LOG)
target_compile_definitions(${PROJECT} PUBLIC CFG_TUSB_DEBUG=${LOG} )
pico_enable_stdio_uart(${PROJECT} 1)
endif()
if(LOGGER STREQUAL "rtt")
pico_enable_stdio_uart(${PROJECT} 0)
target_compile_definitions(${PROJECT} PUBLIC
LOGGER_RTT
SEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
)
target_sources(${PROJECT} PUBLIC
${TOP}/lib/SEGGER_RTT/RTT/SEGGER_RTT.c
)
target_include_directories(${PROJECT} PUBLIC
${TOP}/lib/SEGGER_RTT/RTT
)
endif()