Skip to content

Fix BLTOUCH deploy/stow#14352

Merged
thinkyhead merged 2 commits intobugfix-2.0.xfrom
unknown repository
Jun 21, 2019
Merged

Fix BLTOUCH deploy/stow#14352
thinkyhead merged 2 commits intobugfix-2.0.xfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jun 21, 2019

User reports that M401 and M402 do not work if BLTOUCH_HS_MODE is not enabled

Reference #14328

REPRODUCED, BUG IDENTIFIED and FIXED, TESTING finished

In probe.cpp, some cleanup work needed to be done.

BLTOUCH is a SUBSET of HAS_Z_SERVO_PROBE

The only caveat at the moment, is that in SLOW_MODE (or normal mode) (i.e. BLTOUCH_HS_MODE disabled) the first BLTOUCH discrete DEPLOY action before a probe move and the last BLTOUCH discrete STOW action after a probe move are effectively done twice, once by the discrete action and once be the DEPLOY or STOW macro in the calling routine. After testing this, it is not detrimental.

As users will increasingly be migrating to BLTOUCH_HS_MODE, the old discrete DEPLOY and STOW actions can be phased out in the next mid-range time frame anyway.

probe.cpp is a bit cleaner now and getting closer to the way it should look.

Note that this commit does NOT fix the 2cond part of #14328 (title has been updated, issue still open) or even imply that it was reproduced yet.

@ghost
Copy link
Author

ghost commented Jun 21, 2019

By the way @thinkyhead sorry I goofed and when I put this in a new branch and deleted the other one, gihub closed the original PR which I had not intended. I clean up too much, it seems sigh.

@thinkyhead
Copy link
Member

thinkyhead commented Jun 21, 2019

It's better if commit messages explicitly state what the change does rather than just giving the PR number. We need to be able to scan the commit log in terminals, text editors, and on web pages and see the changes without clicking away to other pages.

@thinkyhead thinkyhead merged commit 8f99d45 into MarlinFirmware:bugfix-2.0.x Jun 21, 2019
@thinkyhead thinkyhead changed the title M40x do not work if BLTOUCH_HS_MODE is not enabled Fix BLTOUCH deploy/stow in HS mode Jun 21, 2019
@ghost ghost deleted the M401_M402 branch June 22, 2019 09:27
@ghost
Copy link
Author

ghost commented Jun 22, 2019

@thinkyhead That title change is wrong, I think.
BLTOUCH deploy/stow works FINE in HS mode. It was when NOT in HS mode that there was a problem with M401 and M402 not doing anything.

thinkyhead added a commit that referenced this pull request Jun 26, 2019
- Revert "Fix FIX_MOUNTED_PROBE compile error (#14393)"
- Revert "Fix G28 with non-BLTouch probes (#14381)"
- Revert "Fix BLTOUCH deploy/stow in HS mode (#14352)"
- Revert "Apply needed BLTouch patch (#14233)"

Co-Authored-By: AnHardt <github@kitelab.de>
@thinkyhead thinkyhead changed the title Fix BLTOUCH deploy/stow in HS mode Fix BLTOUCH deploy/stow Jul 11, 2019
thinkyhead added a commit that referenced this pull request Apr 12, 2020
- Fixes #14328
- Originally #14352
- Reverted in 2580104
ghost pushed a commit to bfhobbes/Marlin that referenced this pull request Apr 15, 2020
mathom pushed a commit to mathom/Marlin that referenced this pull request Apr 17, 2020
jmp0x0000 pushed a commit to jmp0x0000/Marlin that referenced this pull request Aug 7, 2020
njibhu pushed a commit to njibhu/Marlin that referenced this pull request Aug 24, 2020
HairingX pushed a commit to HairingX/Marlin that referenced this pull request Jun 16, 2021
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