Skip to content

Commit 1073b60

Browse files
committed
Merge branch 'master' into arduino_i2s
2 parents 5bb5090 + b580bb2 commit 1073b60

40 files changed

+1972
-224
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ set(CORE_SRCS
3434
cores/esp32/StreamString.cpp
3535
cores/esp32/USB.cpp
3636
cores/esp32/USBCDC.cpp
37+
cores/esp32/USBMSC.cpp
38+
cores/esp32/FirmwareMSC.cpp
39+
cores/esp32/firmware_msc_fat.c
3740
cores/esp32/wiring_pulse.c
3841
cores/esp32/wiring_shift.c
3942
cores/esp32/WMath.cpp
@@ -153,6 +156,7 @@ set(includedirs
153156
libraries/SPI/src
154157
libraries/Ticker/src
155158
libraries/Update/src
159+
libraries/USB/src
156160
libraries/WebServer/src
157161
libraries/WiFiClientSecure/src
158162
libraries/WiFi/src

boards.txt

Lines changed: 255 additions & 48 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)