Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 249a3e2

Browse filesBrowse files
authored
Merge branch 'master' into idf-master
2 parents 9ced459 + a62979d commit 249a3e2
Copy full SHA for 249a3e2

File tree

Expand file treeCollapse file tree

109 files changed

+6780
-727
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

109 files changed

+6780
-727
lines changed

‎CMakeLists.txt

Copy file name to clipboardExpand all lines: CMakeLists.txt
+12Lines changed: 12 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
@@ -73,6 +76,14 @@ set(LIBRARY_SRCS
7376
libraries/Ticker/src/Ticker.cpp
7477
libraries/Update/src/Updater.cpp
7578
libraries/Update/src/HttpsOTAUpdate.cpp
79+
libraries/USB/src/USBHID.cpp
80+
libraries/USB/src/USBHIDMouse.cpp
81+
libraries/USB/src/USBHIDKeyboard.cpp
82+
libraries/USB/src/USBHIDGamepad.cpp
83+
libraries/USB/src/USBHIDConsumerControl.cpp
84+
libraries/USB/src/USBHIDSystemControl.cpp
85+
libraries/USB/src/USBHIDVendor.cpp
86+
libraries/USB/src/USBVendor.cpp
7687
libraries/WebServer/src/WebServer.cpp
7788
libraries/WebServer/src/Parsing.cpp
7889
libraries/WebServer/src/detail/mimetable.cpp
@@ -151,6 +162,7 @@ set(includedirs
151162
libraries/SPI/src
152163
libraries/Ticker/src
153164
libraries/Update/src
165+
libraries/USB/src
154166
libraries/WebServer/src
155167
libraries/WiFiClientSecure/src
156168
libraries/WiFi/src

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.