Fix resume-at-line WCS recovery after G53#674
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 #665
Summary
Exclude non-modal
G53from resume-at-line's active-WCS search while preserving the controller's explicitG53 G0 Z-2recovery move.Changes
G53from the modal WCS candidates used byplayStartLineCommand().G55followed by aG53machine-coordinate move.Why
G53applies machine coordinates to its associated movement; it does not select a persistent coordinate system. Treating it as the most recent WCS can prevent resume-at-line from restoring the program's actualG54-G59.3state.This is state-dependent: if the machine already retains the intended WCS, behavior may be unchanged. The fix removes that dependency and makes resume reconstruction deterministic.
Validation
developimplementation:1 failedbecause the preview contained barebuffer G53and omitted the expectedbuffer G55.PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=/tmp/carvera-test-stubs:. pytest -q tests/unit/test_resume_wcs.py->1 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 commitd989beb58eaa, whose sole parent is pinned upstreamdevelop@2ea66c10e96d88013a04441134d3d4f8e8c88510.Result: 1 passed.
Quality gates on the real branch:
check: passedformat --check: passedgit diff --check 2ea66c10e96d88013a04441134d3d4f8e8c88510..d989beb58eaafc7792eead19cff4a89fabb8f3a6: passed