Skip to content

Update G34 for non-BLTouch probes#14380

Merged
thinkyhead merged 1 commit intobugfix-2.0.xfrom
unknown repository
Jun 24, 2019
Merged

Update G34 for non-BLTouch probes#14380
thinkyhead merged 1 commit intobugfix-2.0.xfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jun 23, 2019

TESTED, can be merged

Part of the BLTOUCH cleanup. In preparation for later changes in motion.cpp.

Instead of a conditional bltouch.stow() in certain cases, use the STOW_PROBE macro.

The probe (whatever kind) is left deployed after the last call of many calls to probe_pt(...) in the iterations of the G34 process.

It is a good idea to STOW_PROBE unconditionally, because the probe might not be a BLTOUCH at all.

Now that BLTOUCH is included well in the STOW_PROBE macro, it is sensible to handle it via that route in those places where any kind of special BLTOUCH handling is not necessary.

Travel to the homing point will occur in STOWED configuration. Then Z homing will occur.

If the while loop is terminated due to probe failure, the probe_pt(...) function will have STOWed the probe itself.

Planned changes in motion.cpp would break the current version, and I don't want to create a huge PR, so this one should come first in a step by step process.

@ghost ghost mentioned this pull request Jun 23, 2019
@thinkyhead thinkyhead merged commit 12d21e6 into MarlinFirmware:bugfix-2.0.x Jun 24, 2019
@thinkyhead thinkyhead changed the title G34_M422.cpp fix to work with ALL probe types, not only BLTOUCH Update G34 for non-BLTouch probes Jun 24, 2019
@ghost ghost deleted the G34_M422_STOW branch June 24, 2019 08:14
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.

1 participant

Comments