Skip to content

Commit d1708bc

Browse files
committed
move menu check to TinyUSB_API
1 parent f2168e4 commit d1708bc

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

src/Adafruit_TinyUSB.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@
2525
#ifndef ADAFRUIT_TINYUSB_H_
2626
#define ADAFRUIT_TINYUSB_H_
2727

28-
// Error message for Core that must select TinyUSB via menu
29-
#if !defined(USE_TINYUSB) && \
30-
(defined(ARDUINO_ARCH_SAMD) || \
31-
(defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)))
32-
#error TinyUSB is not selected, please select it in "Tools->Menu->USB Stack"
33-
#endif
34-
3528
// ESP32 out-of-sync
3629
#ifdef ARDUINO_ARCH_ESP32
3730
#include "arduino/ports/esp32/tusb_config_esp32.h"

src/arduino/Adafruit_TinyUSB_API.h

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,24 @@
3232
// TinyUSB_API, USBD_CDC, USBD_Device, USBD_Interface,
3333
#define TINYUSB_API_VERSION 30000
3434

35+
#if defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_NRF52_ADAFRUIT) || \
36+
defined(ARDUINO_ARCH_ESP32) || \
37+
(defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED))
38+
#define TINYUSB_HAS_BUITLTIN_CORE_SUPPORT
39+
#endif
40+
3541
// Core that has built-in support: Adafruit SAMD, Adafruit nRF, rp2040, esp32
36-
#if !(defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_NRF52_ADAFRUIT) || \
37-
defined(ARDUINO_ARCH_ESP32) || \
38-
(defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_MBED)))
42+
#if !defined(TINYUSB_HAS_BUITLTIN_CORE_SUPPORT)
3943
#define TINYUSB_NEED_POLLING_TASK
4044
#endif
4145

46+
// Error message for Core that must select TinyUSB via menu (built-in except
47+
// esp32)
48+
#if !defined(USE_TINYUSB) && (defined(TINYUSB_HAS_BUITLTIN_CORE_SUPPORT) && \
49+
!defined(ARDUINO_ARCH_ESP32))
50+
#error TinyUSB is not selected, please select it in "Tools->Menu->USB Stack"
51+
#endif
52+
4253
//--------------------------------------------------------------------+
4354
// Core API
4455
// Should be called by BSP Core to initialize, process task

src/arduino/Adafruit_USBD_CDC.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,13 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
9595

9696
extern Adafruit_USBD_CDC SerialTinyUSB;
9797

98-
// Built-in support "Serial" is used with TinyUSB CDC
98+
// Built-in support "Serial" is assigned to TinyUSB CDC
9999
#if defined(USE_TINYUSB)
100-
#define Serial SerialTinyUSB
100+
#define SerialTinyUSB Serial
101101
#endif
102102

103+
extern Adafruit_USBD_CDC SerialTinyUSB;
104+
103105
#endif // else of ESP32
104106
#endif // __cplusplus
105107

0 commit comments

Comments
 (0)