Skip to content

Fix S2/S3 USB #6687

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.

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

Merged
merged 1 commit into from
Aug 3, 2022
Merged

Fix S2/S3 USB #6687

merged 1 commit into from
Aug 3, 2022

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Aug 2, 2022

The new Kconfig that fixed C3 added a dependency on USB_OTG_SUPPORTED
that is only calculated if we include the usb module in cmake.

Fixes #6679

The new Kconfig that fixed C3 added a dependency on USB_OTG_SUPPORTED
that is only calculated if we include the usb module in cmake.

Fixes micropython#6679
@tannewt tannewt requested a review from jepler August 2, 2022 21:13
@RetiredWizard
Copy link

This change got WiFi working again on my Feather ESP32-S3

@jepler
Copy link

jepler commented Aug 2, 2022

It doesn't mean this PR shouldn't be taken as-is but just for posterity I noticed that I can make the components conditional on CircuitPython settings in mpconfig...

if("${CIRCUITPY_ESP32_CAMERA}")
message("Including esp32-camera")
set(EXTRA_COMPONENT_DIRS "esp32-camera")
list(APPEND COMPONENTS "esp32-camera")
message("COMPONENTS = ${COMPONENTS}")
endif()

and in Makefile add to the cmake command: -DCIRCUITPY_ESP32_CAMERA=$(CIRCUITPY_ESP32_CAMERA)

something similar could be done for CIRCUITPY_USB.

Copy link

@jepler jepler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is green, ship it.

@RetiredWizard
Copy link

Tested on my DevkitC-1-n8r2 with no problems.

@gamblor21
Copy link
Member

Worked on my n8r8

@gamblor21 gamblor21 merged commit febedeb into adafruit:main Aug 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Import Wifi or Web Workflow startup (.env file exists) crash ESP32-S3 builds
4 participants