axis: fix Z jog after touch off on unhomed lathe (2.9 backport of #4007)#4015
Open
grandixximo wants to merge 1 commit into
Open
axis: fix Z jog after touch off on unhomed lathe (2.9 backport of #4007)#4015grandixximo wants to merge 1 commit into
grandixximo wants to merge 1 commit into
Conversation
2 tasks
ja_from_rbutton used the compact "xzabcuvw" letter map whenever the machine was unhomed, regardless of jog mode. Touch off forces teleop via set_motion_teleop(1), so a follow-up Z jog hit the teleop axis slot 1 (Y) instead of slot 2 (Z) and silently no-op'd. Gate the compact map on jjogmode so teleop axis jogs always use the full "xyzabcuvw" slot map.
grandixximo
force-pushed
the
fix/3994-axis-touchoff-jog-2.9
branch
from
b1c9c9a to
d1f53a0
Compare
Contributor
Author
|
Just rebased to have the GitHub CI not complain, all green ready to merge, @andypugh ready to merge, small axis UI fix worth having in 2.9 as well |
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
1 participant
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.
Summary
Backport of #4007 (merged to master/2.10) to the 2.9 branch.
Fixes #3994: on an unhomed lathe, touching off forces teleop mode via
set_motion_teleop(1). A follow-up Z jog then hit the teleop axis slot 1 (Y) instead of slot 2 (Z) and silently no-op'd, becauseja_from_rbuttonused the compactxzabcuvwletter map whenever the machine was unhomed, regardless of jog mode.Fix gates the compact map on
jjogmodeso teleop axis jogs always use the fullxyzabcuvwslot map.Cherry-pick of 7a6dfdd onto 2.9, no conflicts.
Context
I communicated with the original reporter of #3994. They are on stable 2.9.8 and do not want to build from source. The best I can offer is a PR against 2.9 so the fix lands in the next stable release.
Test plan
xzabcuvwmap