[1.1] Fix 'M32 P' subroutines #8432
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
thinkyhead
force-pushed
the
bf1_fix_M32_subroutines
branch
3 times, most recently
from
e77e98a
to
6fb74c0
Compare
thinkyhead
force-pushed
the
bf1_fix_M32_subroutines
branch
from
6fb74c0
to
a6ee4a0
Compare
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.
Addressing #8418
The
M32 Psubroutine handling code has been pretty broken. While you could start a sub-procedure in another file, it would fail to return and continue where it left off when the sub-procedure was done. This PR applies patches to address this issue.Part of this fix involved changing the behavior of
workDirParentsas used by SD menu navigation. Instead of storing the parent directory on subfolder entry, it now stores the current working directory. When going up one level instead of always taking the last entry, take the previous entry, or, if none, assume the root directory. This makes it easier to build the full path to the printjob file.Several fixes and cleanups were applied to SD code in the
bugfix-2.0.xbranch but were not brought over to this branch. Those fixes and cleanups are also included as separate commits.#ifndefat the top. (#pragma oncemay now be viable too.)#if ENABLED(SDSUPPORT)from all headers but one. Only.cppgenerally needs it.