Merge 2.9 into master - #4575
Merged
Merged
Conversation
fix multiple homing of absolute encoders LinuxCNC#3717
On abort, restore_from_tag() executes a G-code string built from the difference between the motion state tag and the interpreter readahead state. gen_settings() unconditionally appends the saved S word, so after an early abort the restore queued EMC_SPINDLE_SPEED onto the interp_list and it was issued after the abort's spindle stop, turning the spindle back on. Late aborts were unaffected because tag and readahead state agree by then and no restore command is generated. Exclude the spindle speed from the abort restore, as is already done for M codes. The M72 restore_settings() path keeps restoring it, since there the S word must take effect mid-program.
A column-0 '* ' bullet that follows a column-0 paragraph or a standalone (((index))) line with no blank line between gets folded into that paragraph and no list is rendered. Whole option lists in the [RS274NGC] and other INI sections, in the M-code chapter and in the G-code overview currently render as one run-on paragraph with literal '*' and '+' characters. Insert the blank line at those 35 boundaries (9 files).
docs: add the missing blank line before * bullets in source
…dle-2.9 interp: don't restore spindle speed on abort state restore
homing.c: fix accumulation of HOME_OFFSETs when re-homing absolute encoders (2.9 backport)
Removed 'debian:bullseye' from CI workflow images. closes LinuxCNC#4510
…plete backport: halcmd: Fix auto-complete after change to libedit
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Merge 2.9 into master.
All changes from the recent 2.9 commits are already on master, so this merge carries no net tree change and only records the ancestry:
Conflicts were all docs indexterm-style divergences plus one parameter-name difference in gen_settings(), all resolved in favor of master.