Merge pull request #257 from adafruit/release-2.0.0

hathach · web-flow · commit 0386ab6f4f5f · 2023-03-06T19:34:02.000+07:00
Release 2.0.0
diff --git a/library.properties b/library.properties
@@ -1,9 +1,9 @@
 name=Adafruit TinyUSB Library
-version=1.18.4
+version=2.0.0
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=TinyUSB library for Arduino
-paragraph=Support nRF5x, SAMD21, SAMD51, RP2040, ESP32-S2
+paragraph=Support nRF5x, SAMD21, SAMD51, RP2040, ESP32-S2/S3
 category=Communication
 url=https://github.com/adafruit/Adafruit_TinyUSB_Arduino
 architectures=*
diff --git a/src/Adafruit_TinyUSB.h b/src/Adafruit_TinyUSB.h
@@ -34,7 +34,7 @@
 #include "tusb_option.h"
 
 // Device
-#if TUSB_OPT_DEVICE_ENABLED
+#if CFG_TUD_ENABLED
 
 #include "arduino/Adafruit_USBD_Device.h"
 
diff --git a/src/arduino/Adafruit_TinyUSB_API.cpp b/src/arduino/Adafruit_TinyUSB_API.cpp
@@ -25,7 +25,7 @@
 #include "tusb_option.h"
 
 // ESP32 will use the arduino-esp32 core initialization and Serial
-#if TUSB_OPT_DEVICE_ENABLED && !defined(ARDUINO_ARCH_ESP32)
+#if CFG_TUD_ENABLED && !defined(ARDUINO_ARCH_ESP32)
 
 #include "Adafruit_TinyUSB.h"
 
diff --git a/src/arduino/Adafruit_TinyUSB_API.h b/src/arduino/Adafruit_TinyUSB_API.h
@@ -30,7 +30,7 @@
 
 // API Version, need to be updated when there is changes for
 // TinyUSB_API, USBD_CDC, USBD_Device, USBD_Interface,
-#define TINYUSB_API_VERSION 11600
+#define TINYUSB_API_VERSION 20000
 
 //--------------------------------------------------------------------+
 // Core API
diff --git a/src/arduino/Adafruit_USBD_CDC.cpp b/src/arduino/Adafruit_USBD_CDC.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED && CFG_TUD_CDC && !defined(ARDUINO_ARCH_ESP32)
+#if CFG_TUD_ENABLED && CFG_TUD_CDC && !defined(ARDUINO_ARCH_ESP32)
 
 #include "Arduino.h"
 
@@ -265,4 +265,4 @@ void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {
 }
 }
 
-#endif // TUSB_OPT_DEVICE_ENABLED
+#endif // CFG_TUD_ENABLED
diff --git a/src/arduino/Adafruit_USBD_Device.cpp b/src/arduino/Adafruit_USBD_Device.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED
+#if CFG_TUD_ENABLED
 
 #include "Adafruit_TinyUSB_API.h"
 
@@ -555,4 +555,4 @@ void tud_dfu_runtime_reboot_to_dfu_cb(void) {
 
 #endif // ESP32
 
-#endif // TUSB_OPT_DEVICE_ENABLED
+#endif // CFG_TUD_ENABLED
diff --git a/src/arduino/hid/Adafruit_USBD_HID.cpp b/src/arduino/hid/Adafruit_USBD_HID.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED && CFG_TUD_HID
+#if CFG_TUD_ENABLED && CFG_TUD_HID
 
 #include "Adafruit_USBD_HID.h"
 
@@ -288,4 +288,4 @@ bool Adafruit_USBD_HID::mouseButtonRelease(uint8_t report_id) {
   return tud_hid_mouse_report(report_id, 0, 0, 0, 0, 0);
 }
 
-#endif // TUSB_OPT_DEVICE_ENABLED
+#endif // CFG_TUD_ENABLED
diff --git a/src/arduino/midi/Adafruit_USBD_MIDI.cpp b/src/arduino/midi/Adafruit_USBD_MIDI.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED && CFG_TUD_MIDI
+#if CFG_TUD_ENABLED && CFG_TUD_MIDI
 
 #include "Adafruit_USBD_MIDI.h"
 
@@ -190,4 +190,4 @@ bool Adafruit_USBD_MIDI::readPacket(uint8_t packet[4]) {
   return tud_midi_packet_read(packet);
 }
 
-#endif // TUSB_OPT_DEVICE_ENABLED
+#endif // CFG_TUD_ENABLED
diff --git a/src/arduino/msc/Adafruit_USBD_MSC.cpp b/src/arduino/msc/Adafruit_USBD_MSC.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED && CFG_TUD_MSC
+#if CFG_TUD_ENABLED && CFG_TUD_MSC
 
 #include "Adafruit_USBD_MSC.h"
 
@@ -292,4 +292,4 @@ bool tud_msc_is_writable_cb(uint8_t lun) {
 
 } // extern "C"
 
-#endif // TUSB_OPT_DEVICE_ENABLED
+#endif // CFG_TUD_ENABLED
diff --git a/src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp b/src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if defined(ARDUINO_ARCH_ESP32) && TUSB_OPT_DEVICE_ENABLED
+#if defined(ARDUINO_ARCH_ESP32) && CFG_TUD_ENABLED
 
 #include <stdint.h>
 
diff --git 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 && CFG_TUD_ENABLED
 
 #include "nrfx.h"
 #include "nrfx_power.h"
diff --git 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 && CFG_TUD_ENABLED
 
 #include "Arduino.h"
 
diff --git 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 && CFG_TUD_ENABLED
 
 #include "Arduino.h"
 #include <Reset.h> // Needed for auto-reset with 1200bps port touch
diff --git a/src/arduino/webusb/Adafruit_USBD_WebUSB.cpp b/src/arduino/webusb/Adafruit_USBD_WebUSB.cpp
@@ -24,7 +24,7 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED && CFG_TUD_VENDOR
+#if CFG_TUD_ENABLED && CFG_TUD_VENDOR
 
 #include "Adafruit_USBD_WebUSB.h"
 #include "Arduino.h"
@@ -349,4 +349,4 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage,
 }
 }
 
-#endif // TUSB_OPT_DEVICE_ENABLED
+#endif // CFG_TUD_ENABLED

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`#include "tusb_option.h"`
`26`	`26`
`27`		`-#if TUSB_OPT_DEVICE_ENABLED && CFG_TUD_CDC && !defined(ARDUINO_ARCH_ESP32)`
	`27`	`+#if CFG_TUD_ENABLED && CFG_TUD_CDC && !defined(ARDUINO_ARCH_ESP32)`
`28`	`28`
`29`	`29`	`#include "Arduino.h"`
`30`	`30`
`@@ -265,4 +265,4 @@ void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`
`268`		`-#endif // TUSB_OPT_DEVICE_ENABLED`
	`268`	`+#endif // CFG_TUD_ENABLED`