Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add USB host support for esp32s2(s3), support OTG dual-mode #2922

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Add USB host support for esp32s2(s3), support OTG dual-mode #2922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0d7d39
Include `usb` component from IDF
mikee47 Dec 1, 2024
ae99690
Hide unused parameter warnings
mikee47 Dec 12, 2024
df55bc4
Update USB library with esp32sx host and OTG dual-mode support
mikee47 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sming/Arch/Esp32/Components/driver/include/driver/hw_timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@
#include <stdint.h>
#include <esp_idf_version.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#if CONFIG_ESP_TIMER_IMPL_TG0_LAC
#include <soc/timer_group_reg.h>
#else
#include <hal/systimer_ll.h>
#endif
#pragma GCC diagnostic pop

#ifdef __cplusplus
extern "C" {
Expand Down
7 changes: 6 additions & 1 deletion Sming/Arch/Esp32/Components/esp32/component.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ SDK_INCDIRS := \
esp_netif/include \
esp_eth/include \
esp_wifi/include \
lwip/include/apps/sntp
lwip/include/apps/sntp \
usb/include

ifdef IDF_VERSION_4x
SDK_INCDIRS += \
Expand Down Expand Up @@ -262,6 +263,10 @@ SDK_COMPONENTS := \
soc \
spi_flash

ifneq (,$(filter esp32s2 esp32s3,$(SMING_SOC)))
SDK_COMPONENTS += usb
endif

ifdef IDF_VERSION_43
SDK_COMPONENTS += $(ESP_VARIANT)
else
Expand Down
2 changes: 1 addition & 1 deletion Sming/Libraries/USB
Open in desktop
Submodule USB updated 23 files
+0 −4 README.rst
+4 −2 component.mk
+5 −1 samples/Basic_Device/app/application.cpp
+24 −24 samples/Basic_Device/basic_device.usbcfg
+3 −3 samples/Basic_Host/app/application.cpp
+1 −1 samples/Basic_Host/component.mk
+1 −1 samples/CDC_MSC_HID_Host/app/application.cpp
+1 −1 samples/HID_Composite_Device/app/application.cpp
+17 −47 src/Arch/Esp32/init.cpp
+2 −1 src/Arch/Host/init.cpp
+2 −1 src/Arch/Rp2040/init.cpp
+68 −15 src/USB.cpp
+14 −1 src/USB.h
+10 −6 src/USB/CDC/Device.cpp
+2 −2 src/USB/CDC/Device.h
+2 −1 src/USB/CDC/UsbSerial.cpp
+1 −0 src/USB/CDC/UsbSerial.h
+38 −0 src/USB/Descriptors.cpp
+2 −1 src/USB/MSC/Device.cpp
+6 −0 src/USB/VENDOR/xbox.cpp
+0 −0 src/USB/VENDOR/xbox.h
+1 −1 tinyusb
+198 −26 tinyusb.patch
2 changes: 1 addition & 1 deletion samples/Basic_IFS/app/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ bool initFileSystem()
#endif

#ifdef ENABLE_USB_STORAGE
USB::begin();
USB::begin(true);
USB::MSC::onMount([](auto inst) {
usbStorage.begin(inst);
usbStorage.enumerate([](auto& unit, const USB::MSC::Inquiry& inquiry) {
Expand Down
Loading