Skip to content

[1.1.x] Shorter Z raise between multiple probes#11233

Merged
thinkyhead merged 2 commits intoMarlinFirmware:bugfix-1.1.xfrom
nightgryphon:multiprobe-z-up
Jul 13, 2018
Merged

[1.1.x] Shorter Z raise between multiple probes#11233
thinkyhead merged 2 commits intoMarlinFirmware:bugfix-1.1.xfrom
nightgryphon:multiprobe-z-up

Conversation

@nightgryphon
Copy link
Contributor

Requirements

Description

For some probes like micro switches the full Z clearance raise between probing attempts is not required while bigger Z clearance between probe points is still needed to avoid clamps and other obstacles. The shorter Z raise within multiprobing same point significantly increase probing speed and the whole auto level process.

Benefits

Significantly increase speed of multiple attempts (fast/slow) probing especially useful for multi point bed leveling

Related Issues

@ghost
Copy link

ghost commented Jul 9, 2018

Hi again, that's better :)
2 little things tho, you need to make PRs to the "bugfix-x.x" branch(es) as they are the "in development" ones, and you messed a bit when you merged upstream into your multiprobe-z branch.
You might want to squash your 3 commits and rebase so it can be easily edited/cherry picked etc.. ;)

@nightgryphon
Copy link
Contributor Author

Should i close this request and do the new one to do this?

@fiveangle
Copy link

fiveangle commented Jul 9, 2018

https://blog.github.com/2016-08-15-change-the-base-branch-of-a-pull-request/

[and of course make sure the commit on your own repo reflects the same, most likely with a rebase]

@nightgryphon nightgryphon changed the base branch from 1.1.x to bugfix-1.1.x July 9, 2018 13:23
@nightgryphon
Copy link
Contributor Author

Thanks!
I've changed request base. Actually my multiprobe-z-up branch was based on bugfix-1.1.x so now i see only my changes here.
But i can't find how to squash commits :(

@ghost
Copy link

ghost commented Jul 9, 2018

Hehe, don't worry about squashing them, whoever merges it can squash them at that moment ;)
If you wanna try here's a quick how to (make a backup first) :
git rebase -i HEAD~X (where X is the number of commits from head you want to rebase)
-i means interactive it opens the rebase window in a text editor, from the interactive window, replace "pick" in front of commits by "squash" to squash them with the commit above, then save and exit.
Now that you squashed your 3 commits in one, check nothing got lost ("git show XYZ" where XYZ is your commit hash) and push the changes : "git push -f" (it will force push, note the -f, in order to replace the unsquashed commits you pushed)
In your case try "git rebase HEAD~3" and squash your last 2 commits into " Shorter Z up move between multiple probing attempts"

@thinkyhead thinkyhead changed the title Shorter Z up move between multiple probing attempts [1.1.x] Shorter Z raise between multiple probes Jul 13, 2018
nightgryphon and others added 2 commits July 12, 2018 22:27
For some probes like micro switches the full Z clearance raise between
probing attempts is not required while bigger Z clearance between probe
points is still needed to avoid clamps. The shorter Z raise within
multiprobing same point significantly increase probing speed and the whole
auto level process.
@thinkyhead thinkyhead merged commit d60b2e5 into MarlinFirmware:bugfix-1.1.x Jul 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants