Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't skip BLTouch deployment with high speed probing #26033

Merged
merged 9 commits into from
Jul 17, 2023
Merged

Don't skip BLTouch deployment with high speed probing #26033

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b3d9b4
Fixed USB disconnect behavior
smiksky Apr 27, 2023
2e8c0e5
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.x
smiksky Jun 8, 2023
371cabb
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.x
smiksky Jun 21, 2023
209c7b0
Always confirm bltouch deployment
smiksky Jun 21, 2023
a701988
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.x
smiksky Jun 29, 2023
1e7f96f
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.x
smiksky Jun 29, 2023
14be31c
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.x
smiksky Jun 29, 2023
ec85815
Merge 'bugfix-2.1.x' into pr/26033
thinkyhead Jul 5, 2023
f323df2
tweak
thinkyhead Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Marlin/src/module/probe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,10 +596,8 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
thermalManager.wait_for_hotend_heating(active_extruder);
#endif

#if ENABLED(BLTOUCH)
if (!bltouch.high_speed_mode && bltouch.deploy())
return true; // Deploy in LOW SPEED MODE on every probe action
#endif
// Ensure the BLTouch is deployed. Does nothing if already deployed.
if (TERN0(BLTOUCH, bltouch.deploy())) return true;

#if HAS_Z_SERVO_PROBE && (ENABLED(Z_SERVO_INTERMEDIATE_STOW) || defined(Z_SERVO_MEASURE_ANGLE))
probe_specific_action(true); // Always re-deploy in this case
Expand Down