bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix homing with probe feedrates

Browse Source
This commit is contained in:
Scott Lahteine
2018-04-30 03:35:07 -05:00
parent 59fda986ea
commit 4dfc011d86
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/probe.cpp
View File

@ -568,7 +568,7 @@ static bool do_probe_move(const float z, const float fr_mm_m) {
#if MULTIPLE_PROBING == 2
// Do a first probe at the fast speed
if (do_probe_move(z_probe_low_point, Z_PROBE_SPEED_FAST)) return NAN;
if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) return NAN;
float first_probe_z = current_position[Z_AXIS];
@ -588,7 +588,7 @@ static bool do_probe_move(const float z, const float fr_mm_m) {
if (current_position[Z_AXIS] > z) {
// If we don't make it to the z position (i.e. the probe triggered), move up to make clearance for the probe
if (!do_probe_move(z, Z_PROBE_SPEED_FAST))
if (!do_probe_move(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
do_blocking_move_to_z(current_position[Z_AXIS] + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
}
#endif
@ -599,7 +599,7 @@ static bool do_probe_move(const float z, const float fr_mm_m) {
#endif
// Move down slowly to find bed, not too far
if (do_probe_move(z_probe_low_point, Z_PROBE_SPEED_SLOW)) return NAN;
if (do_probe_move(z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW))) return NAN;
#if MULTIPLE_PROBING > 2
probes_total += current_position[Z_AXIS];