From 275458cfdc03cbeb32843019f6b8a9453b0dbfac Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 28 Aug 2026 10:47:22 +0000
Subject: [PATCH 1/3] fix: Update Adafruit_USBD_CDC.h include path for
 PlatformIO

Co-authored-by: tyeth <6692083+tyeth@users.noreply.github.com>
---
 cores/arduino/Arduino.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 175dcf705..952152524 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -151,7 +151,11 @@ void loop( void ) ;
 // USB
 #ifdef USE_TINYUSB
   // Needed for declaring Serial
-  #include "Adafruit_USBD_CDC.h"
+  #if defined(PLATFORMIO) || defined(__PLATFORMIO__)
+    #include "arduino/Adafruit_USBD_CDC.h"
+  #else
+    #include "Adafruit_USBD_CDC.h"
+  #endif
 #else
   #include "USB/USBDesc.h"
   #include "USB/USBCore.h"

From 8402bd372963ff45b85bc000d743b02b90190308 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 28 Aug 2026 10:47:52 +0000
Subject: [PATCH 2/3] fix: simplify PLATFORMIO macro check in Arduino.h

Co-authored-by: tyeth <6692083+tyeth@users.noreply.github.com>
---
 cores/arduino/Arduino.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 952152524..29a5c9038 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -151,7 +151,7 @@ void loop( void ) ;
 // USB
 #ifdef USE_TINYUSB
   // Needed for declaring Serial
-  #if defined(PLATFORMIO) || defined(__PLATFORMIO__)
+  #if defined(PLATFORMIO)
     #include "arduino/Adafruit_USBD_CDC.h"
   #else
     #include "Adafruit_USBD_CDC.h"

From 09f56c8645ee0ca8da2dc8db07bbd8727b489714 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 28 Aug 2026 10:48:27 +0000
Subject: [PATCH 3/3] Apply remaining changes

Co-authored-by: tyeth <6692083+tyeth@users.noreply.github.com>
---
 libraries/Adafruit_TinyUSB_Arduino | 1 -
 libraries/Adafruit_ZeroDMA         | 1 -
 2 files changed, 2 deletions(-)
 delete mode 160000 libraries/Adafruit_TinyUSB_Arduino
 delete mode 160000 libraries/Adafruit_ZeroDMA

diff --git a/libraries/Adafruit_TinyUSB_Arduino b/libraries/Adafruit_TinyUSB_Arduino
deleted file mode 160000
index 3e5369cd4..000000000
--- a/libraries/Adafruit_TinyUSB_Arduino
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3e5369cd4720c63d9caf31db6ca4c18ce7bcd0b7
diff --git a/libraries/Adafruit_ZeroDMA b/libraries/Adafruit_ZeroDMA
deleted file mode 160000
index 5b48867c1..000000000
--- a/libraries/Adafruit_ZeroDMA
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b48867c1d3015ec63cd8f31def45f5a2d8e49bd