diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 084b6290b..fe77dd00e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -499,6 +499,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 2f5c5d911..dc529897f 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1591,7 +1591,7 @@ static void set_axis_is_at_home(AxisEnum axis) { /** * Some planner shorthand inline functions */ -inline float set_homing_bump_feedrate(AxisEnum axis) { +inline float get_homing_bump_feedrate(AxisEnum axis) { const int homing_bump_divisor[] = HOMING_BUMP_DIVISOR; int hbd = homing_bump_divisor[axis]; if (hbd < 1) { @@ -1599,8 +1599,7 @@ inline float set_homing_bump_feedrate(AxisEnum axis) { SERIAL_ECHO_START; SERIAL_ECHOLNPGM("Warning: Homing Bump Divisor < 1"); } - feedrate_mm_m = homing_feedrate_mm_m[axis] / hbd; - return feedrate_mm_m; + return homing_feedrate_mm_m[axis] / hbd; } // // line_to_current_position @@ -1620,7 +1619,7 @@ inline void line_to_axis_pos(AxisEnum axis, float where, float fr_mm_m = 0.0) { current_position[axis] = where; feedrate_mm_m = (fr_mm_m != 0.0) ? fr_mm_m : homing_feedrate_mm_m[axis]; planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], MMM_TO_MMS(feedrate_mm_m), active_extruder); - stepper.synchronize(); // The lost one + stepper.synchronize(); feedrate_mm_m = old_feedrate_mm_m; } @@ -2068,85 +2067,35 @@ static void clean_up_after_endstop_or_probe_move() { // at the height where the probe triggered. static float run_z_probe() { - float old_feedrate_mm_m = feedrate_mm_m; - // Prevent stepper_inactive_time from running out and EXTRUDER_RUNOUT_PREVENT from extruding refresh_cmd_timeout(); - #if ENABLED(DELTA) - - float start_z = current_position[Z_AXIS]; - long start_steps = stepper.position(Z_AXIS); - - #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 1", current_position); - #endif - - // move down slowly until you find the bed - feedrate_mm_m = homing_feedrate_mm_m[Z_AXIS] / 4; - destination[Z_AXIS] = -10; - prepare_move_to_destination_raw(); // this will also set_current_to_destination - stepper.synchronize(); - endstops.hit_on_purpose(); // clear endstop hit flags - - /** - * We have to let the planner know where we are right now as it - * is not where we said to go. - */ - long stop_steps = stepper.position(Z_AXIS); - float mm = start_z - float(start_steps - stop_steps) / planner.axis_steps_per_mm[Z_AXIS]; - current_position[Z_AXIS] = mm; - - #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe (DELTA) 2", current_position); - #endif - - #else // !DELTA - - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - planner.bed_level_matrix.set_to_identity(); - #endif - - feedrate_mm_m = homing_feedrate_mm_m[Z_AXIS]; - - // Move down until the Z probe (or endstop?) is triggered - float zPosition = -(Z_MAX_LENGTH + 10); - line_to_z(zPosition); - stepper.synchronize(); - - // Tell the planner where we ended up - Get this from the stepper handler - zPosition = stepper.get_axis_position_mm(Z_AXIS); - planner.set_position_mm( - current_position[X_AXIS], current_position[Y_AXIS], zPosition, - current_position[E_AXIS] - ); - - // move up the retract distance - zPosition += home_bump_mm(Z_AXIS); - line_to_z(zPosition); - stepper.synchronize(); - endstops.hit_on_purpose(); // clear endstop hit flags - - // move back down slowly to find bed - set_homing_bump_feedrate(Z_AXIS); - - zPosition -= home_bump_mm(Z_AXIS) * 2; - line_to_z(zPosition); - stepper.synchronize(); - endstops.hit_on_purpose(); // clear endstop hit flags - - // Get the current stepper position after bumping an endstop - current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS); + #if ENABLED(AUTO_BED_LEVELING_FEATURE) + planner.bed_level_matrix.set_to_identity(); + #endif - #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position); - #endif + current_position[Z_AXIS] = -(Z_MAX_LENGTH + 10); + do_blocking_move_to_z(current_position[Z_AXIS], Z_PROBE_SPEED_FAST); + endstops.hit_on_purpose(); // clear endstop hit flags + // Get the current stepper position after bumping an endstop + current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS); + SYNC_PLAN_POSITION_KINEMATIC(); // tell the planner where we are feedrate_mm_m = homing_feedrate_mm_m[Z_AXIS]; - #endif // !DELTA + // move up the retract distance + current_position[Z_AXIS] += home_bump_mm(Z_AXIS); + do_blocking_move_to_z(current_position[Z_AXIS], Z_PROBE_SPEED_FAST); - SYNC_PLAN_POSITION_KINEMATIC(); + // move back down slowly to find bed + current_position[Z_AXIS] -= home_bump_mm(Z_AXIS) * 2; + do_blocking_move_to_z(current_position[Z_AXIS], Z_PROBE_SPEED_SLOW); + endstops.hit_on_purpose(); // clear endstop hit flags + // Get the current stepper position after bumping an endstop + current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS); + SYNC_PLAN_POSITION_KINEMATIC(); // tell the planner where we are - feedrate_mm_m = old_feedrate_mm_m; + #if ENABLED(DEBUG_LEVELING_FEATURE) + if (DEBUGGING(LEVELING)) DEBUG_POS("run_z_probe", current_position); + #endif return current_position[Z_AXIS]; } @@ -2431,7 +2380,7 @@ static void homeaxis(AxisEnum axis) { line_to_axis_pos(axis, -home_bump_mm(axis) * axis_home_dir); // Move slowly towards the endstop until triggered - line_to_axis_pos(axis, 2 * home_bump_mm(axis) * axis_home_dir, set_homing_bump_feedrate(axis)); + line_to_axis_pos(axis, 2 * home_bump_mm(axis) * axis_home_dir, get_homing_bump_feedrate(axis)); #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) DEBUG_POS("> TRIGGER ENDSTOP", current_position); diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index db188b82e..c0e1d3369 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -499,6 +499,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index d486589a1..a70ee1340 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -481,6 +481,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index b751dee80..fe9068244 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -479,6 +479,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 96a4287cc..5013b505b 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -491,6 +491,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 9027007c8..98d2d4ffa 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -493,6 +493,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index f0b30f861..f562b8a78 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -516,6 +516,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index c9c649a66..bc106ea47 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -499,6 +499,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 4212cddc8..e49bac657 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -499,6 +499,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 38c1d546c..93331357a 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -499,6 +499,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 540b3f696..b3a35bf11 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -496,6 +496,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 3d534f72e..d9fa05ae2 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -507,6 +507,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 9e56cdd3c..fbcd5e77b 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -520,6 +520,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 650a21c01..014f85fc8 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -491,6 +491,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 179cbb999..a5718d6e1 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -499,6 +499,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index ff70e8ce9..b745d4f80 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -541,6 +541,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 4000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN. diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index a623e984c..4db009181 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -541,6 +541,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 4000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN. diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 3f35411f4..8599d74bb 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -541,6 +541,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 4000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN. diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 7dc141227..8cfd21994 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -532,6 +532,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN. diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 939210591..97e656aeb 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -539,6 +539,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN. diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index d26549afb..693c95119 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -502,6 +502,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations. diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 9d3f10201..f516ff978 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -489,6 +489,10 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 +// Speed for the first approach when probing +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z +// Speed for the second approach when probing +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) // // Allen Key Probe is defined in the Delta example configurations.