Skip to content

Commit a56612b

Browse files
authored
Merge pull request #429 from adafruit/ch32-core-support
Add Ch32 built-inn core support
2 parents 6cc5113 + 8cb4032 commit a56612b

25 files changed

+235
-69
lines changed

examples/CDC/cdc_multi/.feather_esp32s2.test.skip

Whitespace-only changes.

examples/CDC/cdc_multi/.feather_esp32s3.test.skip

Whitespace-only changes.

examples/CDC/cdc_multi/.funhouse.test.skip

Whitespace-only changes.

examples/CDC/cdc_multi/.magtag.test.skip

Whitespace-only changes.

examples/CDC/cdc_multi/.metroesp32s2.test.skip

Whitespace-only changes.

examples/CDC/cdc_multi/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/CDC/cdc_multi/.skip.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
feather_esp32s2
2+
feather_esp32s3
3+
funhouse
4+
magtag
5+
metroesp32s2
6+
pico_rp2040_tinyusb_host

examples/CDC/serial_echo/serial_echo.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/* This sketch demonstrates USB CDC Serial echo (convert to upper case) using SerialTinyUSB which
1515
* is available for both core with built-in USB support and without.
16+
* Note: on core with built-in support Serial is alias to SerialTinyUSB
1617
*/
1718

1819
void setup() {

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) || defined(ARDUINO_ARCH_CH32) || \
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

0 commit comments

Comments
 (0)