-
-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Add M5Stack CoreS3 support #5833
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
Draft
ToshihiroMakuuchi
wants to merge
6
commits into
wled:main
Choose a base branch
from
ToshihiroMakuuchi:feature/m5stack-cores3
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4df51db
Add M5Stack CoreS3 support
ToshihiroMakuuchi aa1e36f
Merge branch 'main' into feature/m5stack-cores3
softhack007 9f36e04
Clean up CoreS3 files from initial PR review
ToshihiroMakuuchi 109d3fa
Remove CoreS3 upload watchdog reset workaround
ToshihiroMakuuchi 88f8a4f
Clean up CoreS3 README
ToshihiroMakuuchi 3fa8fa0
Sync Japanese CoreS3 README cleanup
ToshihiroMakuuchi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # M5Stack CoreS3 upload reset stabilization | ||
| # | ||
| # Purpose: | ||
| # ESP32-S3 native USB / USB-Serial-JTAG uploads can occasionally remain | ||
| # in download mode after PlatformIO's default RTS hard reset. | ||
| # | ||
| # PlatformIO's ESP32 builder constructs esptool's --after argument from: | ||
| # board.get("upload.after_reset", "hard_reset") | ||
| # | ||
| # Set that board option early, before the platform builder creates | ||
| # UPLOADERFLAGS. This changes only the post-upload reset method. | ||
| # | ||
| # Expected esptool behavior: | ||
| # --after watchdog-reset | ||
| # | ||
| # No firmware source, build flag, partition, PSRAM, flash, or runtime | ||
| # behavior is modified by this script. | ||
|
|
||
| Import("env") | ||
|
|
||
| TARGET_RESET_METHOD = "watchdog-reset" | ||
|
|
||
|
|
||
| def configure_upload_reset(): | ||
| board = env.BoardConfig() | ||
| previous = board.get("upload.after_reset", "hard_reset") | ||
|
|
||
| if previous == TARGET_RESET_METHOD: | ||
| print( | ||
| "[CoreS3 Upload] post-upload reset already set to " | ||
| f"{TARGET_RESET_METHOD}" | ||
| ) | ||
| return | ||
|
|
||
| board.update("upload.after_reset", TARGET_RESET_METHOD) | ||
|
|
||
| effective = board.get("upload.after_reset", "") | ||
| if effective != TARGET_RESET_METHOD: | ||
| raise RuntimeError( | ||
| "CoreS3 upload reset configuration failed: " | ||
| f"expected {TARGET_RESET_METHOD}, got {effective}" | ||
| ) | ||
|
|
||
| print( | ||
| "[CoreS3 Upload] post-upload reset: " | ||
| f"{previous} -> {TARGET_RESET_METHOD}" | ||
| ) | ||
|
|
||
|
|
||
| if not env.IsIntegrationDump(): | ||
| configure_upload_reset() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.