Skip to content

Commit ee00558

Browse files
committed
define SerialTinyUSB Serial for esp32
1 parent 75fd754 commit ee00558

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.github/workflows/githubci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Build
33
on: [pull_request, push, repository_dispatch]
44

55
concurrency:
6-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
6+
group: ${{ github.workflow }}-${{ github.ref }}
77
cancel-in-progress: true
88

99
env:
10-
ARDUINO_LIBS: "\"Adafruit SPIFlash\" \"MIDI Library\" \"Adafruit seesaw Library\" \"Adafruit NeoPixel\" \"SdFat - Adafruit Fork\" \"SD\" \"Adafruit Circuit Playground\" \"Adafruit InternalFlash\" \"Pico PIO USB\""
10+
ARDUINO_LIBS: "\"Adafruit SPIFlash\" \"Adafruit seesaw Library\" \"Adafruit NeoPixel\" \"Adafruit Circuit Playground\" \"Adafruit InternalFlash\" \"SdFat - Adafruit Fork\" \"SD\" \"MIDI Library\" \"Pico PIO USB\""
1111

1212
jobs:
1313
pre-commit:
@@ -77,9 +77,8 @@ jobs:
7777

7878
- name: Install Libraries
7979
run: |
80-
echo ${{ env.ARDUINO_LIBS }}
81-
# arduino-cli lib install "Adafruit SPIFlash" "MIDI Library" "Adafruit seesaw Library" "Adafruit NeoPixel" "SdFat - Adafruit Fork" "SD" "Adafruit Circuit Playground" "Adafruit InternalFlash" "Pico PIO USB"
8280
arduino-cli lib install ${{ env.ARDUINO_LIBS }}
81+
arduino-cli lib list
8382
8483
- name: test platforms
8584
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }}
@@ -118,7 +117,7 @@ jobs:
118117
BSP_URLS: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
119118
run: |
120119
arduino-cli core install esp32:esp32@${{ matrix.esp32-version }} --additional-urls $BSP_URLS
121-
arduino-cli lib install "Adafruit SPIFlash" "MIDI Library" "Adafruit seesaw Library" "Adafruit NeoPixel" "SdFat - Adafruit Fork" "SD" "Adafruit Circuit Playground" "Adafruit InternalFlash" "Pico PIO USB"
120+
arduino-cli lib install ${{ env.ARDUINO_LIBS }}
122121
arduino-cli core list
123122
arduino-cli lib list
124123

src/arduino/Adafruit_USBD_CDC.h

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

3434
// For ESP32 use USBCDC as it is compatible
3535
#define Adafruit_USBD_CDC USBCDC
36+
#define SerialTinyUSB Serial
3637

3738
#else
3839

tools/build_all.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
['feather_rp2040_tinyusb', 'rp2040:rp2040:adafruit_feather:flash=8388608_0,freq=125,dbgport=Disabled,dbglvl=None,usbstack=tinyusb'],
2323
['metroesp32s2', 'espressif:esp32:adafruit_metro_esp32s2:CDCOnBoot=cdc,MSCOnBoot=default,DFUOnBoot=default,UploadMode=cdc,PSRAM=enabled,PartitionScheme=tinyuf2'],
2424
#[' ', 'espressif:esp32:adafruit_feather_esp32s3:FlashMode=qio,LoopCore=1,EventsCore=1,USBMode=default,CDCOnBoot=cdc,MSCOnBoot=default,DFUOnBoot=default,UploadMode=cdc,PartitionScheme=tinyuf2'],
25+
['ch32v20x', 'WCH:ch32v:CH32V20x_EVT']
2526
]
2627

28+
2729
# return [succeeded, failed, skipped]
2830
def build_sketch(variant, sketch):
2931
ret = [0, 0, 0]
@@ -91,7 +93,8 @@ def build_variant(variant):
9193
else:
9294
build_boards = all_boards
9395

94-
all_examples = list(glob.iglob('examples/**/*.ino', recursive=True))
96+
#all_examples = list(glob.iglob('examples/**/*.ino', recursive=True))
97+
all_examples = [f for f in glob.iglob('examples/**/*.ino', recursive=True) if 'examples/DualRole' not in f]
9598
all_examples.sort()
9699

97100
total_time = time.monotonic()

0 commit comments

Comments
 (0)