From 06b218e4f1968f035358046600777418e1ade3b1 Mon Sep 17 00:00:00 2001
From: sys64738 <sys64738@hellsite.site>
Date: Thu, 11 Nov 2021 17:57:38 +0100
Subject: [PATCH] update for pico sdk 1.3.0

---
 .gitignore        |  3 +--
 CMakeLists.txt    | 10 ++++++++--
 src/tusb_config.h |  2 +-
 tinyusb           |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0396c15..54b8ac0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 cmake-build/
-build/
-build-flash/
+build*/
 ex/
 compile_commands.json
 _old/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96f251a..e318795 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,11 +31,14 @@ if(FAMILY STREQUAL "rp2040")
   endif()
 
   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})
+  #set(PROJECT DragonProbe)
   project(${PROJECT})
-  family_initialize_project(PROJECT ${CMAKE_CURRENT_LIST_DIR}) # calls pico_sdk_init()
-  #pico_sdk_init()
+  #family_initialize_project(PROJECT ${CMAKE_CURRENT_LIST_DIR}) # calls pico_sdk_init()
+  enable_language(C CXX ASM)
+  pico_sdk_init()
 
   #pico_set_program_name(${PROJECT} "${PROJECT}")
   #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)
   else()
 	  #pico_enable_stdio_uart(${PROJECT} 1)
+	  #set_target_properties(${PROJECT} PROPERTIES PICO_TARGET_STDIO_UART 1)
   endif()
   pico_enable_stdio_uart(${PROJECT} 1)
   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()
   message(FATAL_ERROR "Invalid FAMILY '${FAMILY}' specified")
 endif()
diff --git a/src/tusb_config.h b/src/tusb_config.h
index 64bfd0a..855235d 100644
--- a/src/tusb_config.h
+++ b/src/tusb_config.h
@@ -106,7 +106,7 @@ extern "C" {
 //------------- CLASS -------------//
 #define CFG_TUD_MSC  0
 #define CFG_TUD_MIDI 0
-#define CFG_TUD_NET  0
+#define CFG_TUD_ECM_RNDIS  0
 // see also: bsp/<family>/bsp-info.h
 
 #define CFG_TUD_HID_EP_BUFSIZE 64
diff --git a/tinyusb b/tinyusb
index d49938d..4bfab30 160000
--- a/tinyusb
+++ b/tinyusb
@@ -1 +1 @@
-Subproject commit d49938d0f5052bce70e55c652b657c0a6a7e84fe
+Subproject commit 4bfab30c02279a0530e1a56f4a7c539f2d35a293