Fix M03 spindle-speed recovery for resume-at-line#679
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 #670
Summary
Use the controller's existing tokenizer and normalized command matcher for resume-at-line spindle-speed recovery, allowing zero-padded
M03commands to restore their programmedSvalue.Changes
M3/M03tokens and extracts the last validStoken.M3regular expressions.M030boundary cases plus the final resume preview.Why
The general resume logic already recognizes
M03as spindle-on, but the speed helper did not. That mismatch caused the final recovery command to omit the programmed RPM and rely on retained firmware state.Bare
M3is not guaranteed to stop the spindle; it can retain an earlier speed. The correctness and safety concern is nondeterministic stale, wrong, or zero RPM depending on state. This change explicitly restores the file's programmed value.Validation
developimplementation:5 failed, 1 passed; zero-padded cases returnedNone, and the preview emitted barebuffer M3instead ofbuffer M3 S12000.PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=/tmp/carvera-test-stubs:. pytest -q tests/unit/test_resume_m03_speed.py->6 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 commite055b6bfe50c, whose sole parent is pinned upstreamdevelop@2ea66c10e96d88013a04441134d3d4f8e8c88510.Result: 6 passed.
Quality gates on the real branch:
check: passedformat --check: passedgit diff --check 2ea66c10e96d88013a04441134d3d4f8e8c88510..e055b6bfe50c7b34517e6c2b7a0023f4eb2fec2a: passed