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.

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

Merge in 9.1.x fixes for C6 and nRF UF2 reset #9619

Merged
merged 8 commits into from
Sep 13, 2024

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Sep 12, 2024

No description provided.

tannewt and others added 7 commits September 12, 2024 13:35
Espressif's Characteristics allocate memory that may be on the
supervisor heap. We need to free it when stopping BLE workflow.
Otherwise, we leak the memory and eventually safe mode.

Fixes micropython#9599
The BLE workflow was allocating to the VM heap when it wasn't
active and causing a port_malloc.
Some serial sources clear their RX buffers and others didn't. This
cause CP to skip into the REPL based on characters typed before the
CTRL-C. The serial file transfer code looks for "press any key"
which is skipped in this case.

Fixes circuitpython/web-editor#238
Fallback to setting GPREGRET without SD if it isn't active. This
fixes resetting into UF2 when BLE isn't active. Fixes micropython#9423
@tannewt tannewt added this to the 9.2.0 milestone Sep 12, 2024
@tannewt tannewt requested a review from dhalbert September 12, 2024 22:15
dhalbert
dhalbert previously approved these changes Sep 12, 2024
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

👍

@dhalbert dhalbert merged commit 64cb762 into adafruit:main Sep 13, 2024
15 checks passed
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.

2 participants