Fix modal feed recovery for resume-at-line#678
Draft
righteousgambit wants to merge 1 commit into
Draft
Conversation
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
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.
Closes #669
Summary
Recover modal feed words independently of motion-command formatting so resume-at-line can restore standalone and tightly packed
Fvalues before recovery movement.Changes
G1/G2/G3prefix.Ftoken while continuing to ignore comments.F, tightly packed G-code, comments, and recovery-command ordering.Why
Feed is modal independently of a motion word. The previous parser could skip a valid
F275line or a packedX10Y10G1F425line, then restore an older feed before the resume recovery Z move.The motion risk is conditional on retained controller state; the fix makes the recovery value explicit and deterministic.
Validation
developimplementation:3 failed, 2 passed; standalone and packed feed values incorrectly resolved to the older100, and the preview omittedbuffer G1 F275.PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=/tmp/carvera-test-stubs:. pytest -q tests/unit/test_resume_feed_rate.py->5 passed.ruff check carveracontroller/Controller.py tests/unit-> passed.git diff --check develop...HEAD-> passed.Real branch verification
The repository's locked Poetry environment was installed from
poetry.lock. The targeted suite passed on real fork commit7df0e9867548, whose sole parent is pinned upstreamdevelop@2ea66c10e96d88013a04441134d3d4f8e8c88510.Result: 5 passed.
Quality gates on the real branch:
check: passedformat --check: passedgit diff --check 2ea66c10e96d88013a04441134d3d4f8e8c88510..7df0e9867548884728170818e3ee34d873eaecae: passed