Merge 7.2.2 changes into main #6160
Merged
Conversation
This file contains 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
Espressif: Fix i2c pullup detection
- Add reset for autoreload. De-request ticks. - Separate state a little more in autoreload.c - Rename some routines. - Remove redundant settings of CIRCUITPY_AUTORELOAD_DELAY_MS.
whoopsies Co-authored-by: Scott Shawcroft <scott@tannewt.org>
Make autoreload checking more robust
Add a comment as to why the countio object needs to be long-lived.
Backport 6106 (countio long-lived fix) to 7.2.x
7.2.x backport of micropython#6097 (nina-fw update for certs)
Backport from __future__ import annotations from micropython#6117
…ke-sleep 7.2.x autoreload rework (again)
This unifies the delay into the post-run delay that also waits for user input and fake sleep. This ensures we always delay. Previous code would only delay if the code.py was running when autoreload was triggered. Now it will always delay. We also now suspend autoreload when a USB write starts and then resume on completion. This should prevent reloading in between sectors of a single write.
We have a guide that uses it. It was removed in micropython#6043 without realizing that. Fixes micropython#6152
Re-enable BLE on MatrixPortal. Remove PortalBase
Further refine autoreload
dhalbert
previously approved these changes
Mar 15, 2022
…repl fix ReloadException when in REPL
|
@tannewt want to pull in the latest autoreload stuff? |
|
Sure, I might as well since the CI didn't run on that last commit. Will look at the supervisor.reload issue first. |
dhalbert
approved these changes
Mar 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This brings in the reload changes which will be good to test on main. It also brings in the removal of
CIRCUITPY_AUTORELOAD_DELAY_MSdefinitions in each board that were never changed but copied everywhere.