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

Fix print of "soft reboot" when the user presses ^D #7652

Merged
merged 2 commits into from Feb 27, 2023
Merged

Fix print of "soft reboot" when the user presses ^D #7652

merged 2 commits into from Feb 27, 2023

Conversation

xorbit
Copy link

@xorbit xorbit commented Feb 26, 2023

The logic of the main loop was changed between version 7 and 8 (Commit). Something is wrong with the existing version 8 logic so the serial write of "soft reboot" is never executed when the user does a soft reboot.
A consequence of this is that tools like tools/pyboard.py, ampy and mpremote are not able to activate the raw REPL since they execute a soft reboot and wait for this to be printed to the console.

The logic of the main loop was changed between version 7 and 8.
[Commit](9307b62)
Something is wrong with the existing version 8 logic so the serial
write of "soft reboot" is never executed when the user does a
soft reboot.
A consequence of this is that tools like `tools/pyboard.py`, `ampy`
and `mpremote` are not able to activate the raw REPL since they
execute a soft reboot and wait for this to be printed to the console.
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.

Hi - a suggestion to try.

main.c Outdated Show resolved Hide resolved
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.

Tested locally. Thank for you for this fix! Couldyou change the base to 8.0.x soit will get in the next stable 8.0.x release? We will have an 8.0.4 soon -- there is at least one other thing we want to fix on the stable line.

@xorbit
Copy link
Author

xorbit commented Feb 27, 2023

Shoot. I may have screwed that up by checking the "Copy the main branch only" checkbox when I created my CircuitPython fork. So I don't have the 8.0.x branch. I've been looking but I can't find how to add this branch to my fork after the fact. Do you know?

@dhalbert
Copy link
Collaborator

I have found this more difficult recently, not sure why. git fetch adafruit 8.0.x:8.0.x I think works, where adafruit is my name for upstream. But don't worry about this. I'll merge this to main and backport it with a cherry pick, no problem.

@dhalbert dhalbert merged commit dec3cfc into adafruit:main Feb 27, 2023
dhalbert added a commit to dhalbert/circuitpython that referenced this pull request Feb 27, 2023
Fix print of "soft reboot" when the user presses ^D
dhalbert added a commit to dhalbert/circuitpython that referenced this pull request Feb 27, 2023
Fix print of "soft reboot" when the user presses ^D
dhalbert added a commit that referenced this pull request Feb 28, 2023
8.0.x Backport of #7652 ("soft reboot" printing); update frozen libraries
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.

None yet

2 participants