changes to accommodate ever-changing pico_sdk build requirements

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "CMSIS_5"]
 	path = CMSIS_5
 	url = https://github.com/ARM-software/CMSIS_5.git
+[submodule "pico-sdk"]
+	path = pico-sdk
+	url = https://github.com/raspberrypi/pico-sdk

CMakeLists.txt

@@ -1,51 +1,41 @@
-# use directory name for project id
+cmake_minimum_required(VERSION 3.5)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/tinyusb/hw/bsp/family_support.cmake)
+
+# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
 get_filename_component(PROJECT ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 set(PROJECT ${BOARD}-${PROJECT})
 
-# TOP is absolute path to root directory of TinyUSB git repo
-set(TOP "./tinyusb")
-get_filename_component(TOP "${TOP}" REALPATH)
-
-# Check for -DFAMILY=
-if(FAMILY STREQUAL "rp2040")
-  cmake_minimum_required(VERSION 3.12)
-  set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
-  include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
-  project(${PROJECT})
-  pico_sdk_init()
-  add_executable(${PROJECT})
-
-  include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
-
-  # Example source
-  target_sources(${PROJECT} PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/main.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/usb_descriptors.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/bsp/${FAMILY}/cdc_uart.c
-  )
-
- # Example include
-  target_include_directories(${PROJECT} PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Include/
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/Core/Include/
-    ${CMAKE_CURRENT_SOURCE_DIR}/bsp/${FAMILY}/
-    ${CMAKE_CURRENT_SOURCE_DIR}/bsp/default/
-  )
-
-  # Example defines
-  target_compile_definitions(${PROJECT} PUBLIC
-  )
-
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration pico_unique_id)
-
-  pico_add_extra_outputs(${PROJECT})
-
-else()
-  message(FATAL_ERROR "Invalid FAMILY specified")
-endif()
+project(${PROJECT})
+
+# Checks this example is valid for the family and initializes the project
+family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
+
+add_executable(${PROJECT})
+
+# Example source
+target_sources(${PROJECT} PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/main.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/usb_descriptors.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/bsp/${FAMILY}/cdc_uart.c
+        )
+
+# Example include
+target_include_directories(${PROJECT} PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Include/
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/Core/Include/
+        ${CMAKE_CURRENT_SOURCE_DIR}/bsp/${FAMILY}/
+        ${CMAKE_CURRENT_SOURCE_DIR}/bsp/default/
+        )
+
+target_link_libraries(${PROJECT} PUBLIC pico_unique_id)
+
+# Configure compilation flags and libraries for the example... see the corresponding function
+# in hw/bsp/FAMILY/family.cmake for details.
+family_configure_device_example(${PROJECT})

Makefile

@@ -1,6 +1,8 @@
 include ./tinyusb/tools/top.mk
 include ./tinyusb/examples/make.mk
 
+PICO_SDK_PATH = ../../pico-sdk
+
 INC += \
 	. \
 	./CMSIS_5/CMSIS/DAP/Firmware/Include \
@@ -13,11 +15,11 @@ APP_SOURCE += $(wildcard ./*.c)
 SRC_C += $(addprefix $(CURRENT_PATH)/, $(APP_SOURCE))
 
 SRC_C += \
-    ./CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c \
-    ./CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c \
-    ./CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c \
-    ./CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c \
-    ./CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c \
-    ./bsp/$(BOARD)/cdc_uart.c
+	./CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c \
+	./CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c \
+	./CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c \
+	./CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c \
+	./CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c \
+	./bsp/$(BOARD)/cdc_uart.c
 
 include ./tinyusb/examples/rules.mk

tusb_config.h

@@ -64,8 +64,9 @@
   #error "Incorrect RHPort configuration"
 #endif
 
-// This example doesn't use an RTOS
+#ifndef CFG_TUSB_OS
 #define CFG_TUSB_OS               OPT_OS_NONE
+#endif
 
 // CFG_TUSB_DEBUG is defined by compiler in DEBUG build
 // #define CFG_TUSB_DEBUG           0