From a6206b0555905b878930736a40fddf406cc015e3 Mon Sep 17 00:00:00 2001
From: Chris Spegal <Spegs21@gmail.com>
Date: Mon, 28 Mar 2022 15:43:56 -0400
Subject: [PATCH] Enable library for Arduino SAMD based on USBCON

---
 src/Adafruit_TinyUSB.h                               | 4 ++--
 src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp   | 2 +-
 src/arduino/ports/nrf/Adafruit_TinyUSB_nrf.cpp       | 4 ++--
 src/arduino/ports/nrf/tusb_config_nrf.h              | 2 +-
 src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp | 4 ++--
 src/arduino/ports/samd/Adafruit_TinyUSB_samd.cpp     | 4 ++--
 src/arduino/ports/samd/tusb_config_samd.h            | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Adafruit_TinyUSB.h b/src/Adafruit_TinyUSB.h
index 1ece7ed1..b3b0b6c1 100644
--- a/src/Adafruit_TinyUSB.h
+++ b/src/Adafruit_TinyUSB.h
@@ -26,8 +26,8 @@
 #define ADAFRUIT_TINYUSB_H_
 
 // Error message for Core that must select TinyUSB via menu
-#if !defined(USE_TINYUSB) && ( defined(ARDUINO_ARCH_SAMD) || \
-                               (defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)) )
+#if !defined(USE_TINYUSB) && ((defined(ARDUINO_ARCH_SAMD) && defined(ARDUINO_SAMD_ADAFRUIT)) || \
+                              (defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)))
 #error TinyUSB is not selected, please select it in "Tools->Menu->USB Stack"
 #endif
 
diff --git a/src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp b/src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp
index 5cec8849..d0401ad0 100644
--- a/src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp
+++ b/src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp
@@ -183,4 +183,4 @@ extern "C" void yield(void) {
 }
 #endif // commented out
 
-#endif
+#endif // defined(ARDUINO_ARCH_ESP32) && TUSB_OPT_DEVICE_ENABLED
diff --git a/src/arduino/ports/nrf/Adafruit_TinyUSB_nrf.cpp b/src/arduino/ports/nrf/Adafruit_TinyUSB_nrf.cpp
index da97d880..d9a05a72 100644
--- a/src/arduino/ports/nrf/Adafruit_TinyUSB_nrf.cpp
+++ b/src/arduino/ports/nrf/Adafruit_TinyUSB_nrf.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if defined ARDUINO_NRF52_ADAFRUIT && TUSB_OPT_DEVICE_ENABLED
+#if defined(ARDUINO_NRF52_ADAFRUIT) && TUSB_OPT_DEVICE_ENABLED
 
 #include "nrfx.h"
 #include "nrfx_power.h"
@@ -134,4 +134,4 @@ static void usb_hardware_init(void) {
   }
 }
 
-#endif // USE_TINYUSB
+#endif // defined(ARDUINO_NRF52_ADAFRUIT) && TUSB_OPT_DEVICE_ENABLED
diff --git a/src/arduino/ports/nrf/tusb_config_nrf.h b/src/arduino/ports/nrf/tusb_config_nrf.h
index 193beed1..edd411b8 100644
--- a/src/arduino/ports/nrf/tusb_config_nrf.h
+++ b/src/arduino/ports/nrf/tusb_config_nrf.h
@@ -34,7 +34,7 @@ extern "C" {
 //--------------------------------------------------------------------
 #define CFG_TUSB_MCU OPT_MCU_NRF5X
 
-#ifdef USE_TINYUSB
+#ifdef USE_TINYUSB || !defined(USBCON)
 #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE
 #else
 #define CFG_TUSB_RHPORT0_MODE OPT_MODE_NONE
diff --git a/src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp b/src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp
index 74b04ee8..9cdb7d56 100644
--- a/src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp
+++ b/src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if defined ARDUINO_ARCH_RP2040 && TUSB_OPT_DEVICE_ENABLED
+#if defined(ARDUINO_ARCH_RP2040) && TUSB_OPT_DEVICE_ENABLED
 
 #include "Arduino.h"
 
@@ -151,4 +151,4 @@ void TinyUSB_Device_Task(void) {
 }
 }
 
-#endif
+#endif // defined(ARDUINO_ARCH_RP2040) && TUSB_OPT_DEVICE_ENABLED
diff --git a/src/arduino/ports/samd/Adafruit_TinyUSB_samd.cpp b/src/arduino/ports/samd/Adafruit_TinyUSB_samd.cpp
index c374c68f..7ac3f022 100644
--- a/src/arduino/ports/samd/Adafruit_TinyUSB_samd.cpp
+++ b/src/arduino/ports/samd/Adafruit_TinyUSB_samd.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if defined ARDUINO_ARCH_SAMD && TUSB_OPT_DEVICE_ENABLED
+#if defined(ARDUINO_ARCH_SAMD) && TUSB_OPT_DEVICE_ENABLED
 
 #include "Arduino.h"
 #include <Reset.h> // Needed for auto-reset with 1200bps port touch
@@ -156,4 +156,4 @@ uint8_t TinyUSB_Port_GetSerialNumber(uint8_t serial_id[16]) {
   return 16;
 }
 
-#endif
+#endif //  defined(ARDUINO_ARCH_SAMD) && TUSB_OPT_DEVICE_ENABLED
diff --git a/src/arduino/ports/samd/tusb_config_samd.h b/src/arduino/ports/samd/tusb_config_samd.h
index f0651cc8..6475e40b 100644
--- a/src/arduino/ports/samd/tusb_config_samd.h
+++ b/src/arduino/ports/samd/tusb_config_samd.h
@@ -38,7 +38,7 @@ extern "C" {
 #define CFG_TUSB_MCU OPT_MCU_SAMD21
 #endif
 
-#ifdef USE_TINYUSB
+#if defined(USE_TINYUSB) || !defined(USBCON)
 #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE
 #else
 #define CFG_TUSB_RHPORT0_MODE OPT_MODE_NONE