From 35ee12cb4c1889eff2f2b13f31ffbc9490db40e0 Mon Sep 17 00:00:00 2001
From: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Date: Sun, 28 May 2023 02:22:26 +0200
Subject: [PATCH] RP2040: Use Pico SDK USB stack instead of TinyUSB (#2523)

Seems to fix freeze, serial output still stops after a while
---
 variants/rak11310/platformio.ini | 1 -
 variants/rak11310/variant.h      | 4 +---
 variants/rpipico/platformio.ini  | 1 -
 variants/rpipico/variant.h       | 4 +---
 variants/rpipicow/platformio.ini | 1 -
 variants/rpipicow/variant.h      | 4 +---
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index b64c19f5d..89c657fe0 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${rp2040_base.build_flags}
   -DPRIVATE_HW
   -Ivariants/rak11310
   -DDEBUG_RP2040_PORT=Serial
-  -DUSE_TINYUSB
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/rak11310/variant.h b/variants/rak11310/variant.h
index 7bb61fc2f..a2bef0730 100644
--- a/variants/rak11310/variant.h
+++ b/variants/rak11310/variant.h
@@ -50,6 +50,4 @@
 #define SX126X_RESET LORA_RESET
 #define SX126X_POWER_EN 25
 #define SX126X_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
-#endif
-
-#include <Adafruit_TinyUSB.h>
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/variants/rpipico/platformio.ini b/variants/rpipico/platformio.ini
index be051095d..08f7bb2ba 100644
--- a/variants/rpipico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${rp2040_base.build_flags}
   -DPRIVATE_HW
   -Ivariants/rpipico
   -DDEBUG_RP2040_PORT=Serial
-  -DUSE_TINYUSB
   -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =
diff --git a/variants/rpipico/variant.h b/variants/rpipico/variant.h
index f7fc49d6c..7e2660aa6 100644
--- a/variants/rpipico/variant.h
+++ b/variants/rpipico/variant.h
@@ -51,6 +51,4 @@
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
 #define SX126X_E22
-#endif
-
-#include <Adafruit_TinyUSB.h>
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
index a0fd626b3..b032d63d5 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
   -DPRIVATE_HW
   -Ivariants/rpipicow
   -DDEBUG_RP2040_PORT=Serial
-  -DUSE_TINYUSB
   -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =
diff --git a/variants/rpipicow/variant.h b/variants/rpipicow/variant.h
index 4aa0c5a5d..4741fd130 100644
--- a/variants/rpipicow/variant.h
+++ b/variants/rpipicow/variant.h
@@ -49,6 +49,4 @@
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
 #define SX126X_E22
-#endif
-
-#include <Adafruit_TinyUSB.h>
\ No newline at end of file
+#endif
\ No newline at end of file