sys64738
/
DragonProbe
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

update for pico sdk 1.3.0

This commit is contained in:
Triss 2021-11-11 17:57:38 +01:00
parent e546d75dbd
commit 06b218e4f1
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,6 +1,5 @@
cmake-build/ cmake-build/
build/ build*/
build-flash/
ex/ ex/
compile_commands.json compile_commands.json
_old/ _old/

10
CMakeLists.txt
View File

@ -31,11 +31,14 @@ if(FAMILY STREQUAL "rp2040")
endif() endif()
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) # tinyusb stuff include(${TOP}/hw/bsp/${FAMILY}/family.cmake) # tinyusb stuff
include(${TOP}/hw/bsp/family_support.cmake) # tinyusb stuff
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR}) family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
#set(PROJECT DragonProbe)
project(${PROJECT}) project(${PROJECT})
family_initialize_project(PROJECT ${CMAKE_CURRENT_LIST_DIR}) # calls pico_sdk_init() #family_initialize_project(PROJECT ${CMAKE_CURRENT_LIST_DIR}) # calls pico_sdk_init()
#pico_sdk_init() enable_language(C CXX ASM)
pico_sdk_init()
#pico_set_program_name(${PROJECT} "${PROJECT}") #pico_set_program_name(${PROJECT} "${PROJECT}")
#pico_set_program_version(${PROJECT} "0.1") #pico_set_program_version(${PROJECT} "0.1")
@ -49,9 +52,12 @@ if(FAMILY STREQUAL "rp2040")
target_compile_definitions(${PROJECT} PUBLIC USE_USBCDC_FOR_STDIO=1 PICO_STDIO_USB=1) target_compile_definitions(${PROJECT} PUBLIC USE_USBCDC_FOR_STDIO=1 PICO_STDIO_USB=1)
else() else()
#pico_enable_stdio_uart(${PROJECT} 1) #pico_enable_stdio_uart(${PROJECT} 1)
#set_target_properties(${PROJECT} PROPERTIES PICO_TARGET_STDIO_UART 1)
endif() endif()
pico_enable_stdio_uart(${PROJECT} 1) pico_enable_stdio_uart(${PROJECT} 1)
pico_enable_stdio_usb(${PROJECT} 0) pico_enable_stdio_usb(${PROJECT} 0)
#set_target_properties(${PROJECT} PROPERTIES PICO_TARGET_STDIO_UART 1)
#set_target_properties(${PROJECT} PROPERTIES PICO_TARGET_STDIO_USB 0)
else() else()
message(FATAL_ERROR "Invalid FAMILY '${FAMILY}' specified") message(FATAL_ERROR "Invalid FAMILY '${FAMILY}' specified")
endif() endif()

2
src/tusb_config.h
View File

@ -106,7 +106,7 @@ extern "C" {
//------------- CLASS -------------// //------------- CLASS -------------//
#define CFG_TUD_MSC 0 #define CFG_TUD_MSC 0
#define CFG_TUD_MIDI 0 #define CFG_TUD_MIDI 0
#define CFG_TUD_NET 0 #define CFG_TUD_ECM_RNDIS 0
// see also: bsp/<family>/bsp-info.h // see also: bsp/<family>/bsp-info.h
#define CFG_TUD_HID_EP_BUFSIZE 64 #define CFG_TUD_HID_EP_BUFSIZE 64

2
tinyusb

@ -1 +1 @@
Subproject commit d49938d0f5052bce70e55c652b657c0a6a7e84fe Subproject commit 4bfab30c02279a0530e1a56f4a7c539f2d35a293