Shorter Z up move between multiple probing attempts
For some probes like micro switches the full Z clearance raise between probing attempts is not required while bigger Z clearance between probe points is still needed to avoid clamps. The shorter Z raise within multiprobing same point significantly increase probing speed and the whole auto level process.
This commit is contained in:
parent
3b5c81b84a
commit
54adf6f52d
@ -496,7 +496,7 @@
|
|||||||
* Set flags for enabled probes
|
* Set flags for enabled probes
|
||||||
*/
|
*/
|
||||||
#define HAS_BED_PROBE (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
|
#define HAS_BED_PROBE (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
|
||||||
#define PROBE_SELECTED (HAS_BED_PROBE || ENABLED(PROBE_MANUALLY))
|
#define PROBE_SELECTED (HAS_BED_PROBE || ENABLED(PROBE_MANUALLY) || ENABLED(MESH_BED_LEVELING))
|
||||||
|
|
||||||
#if !HAS_BED_PROBE
|
#if !HAS_BED_PROBE
|
||||||
// Clear probe pin settings when no probe is selected
|
// Clear probe pin settings when no probe is selected
|
||||||
|
@ -1233,13 +1233,19 @@
|
|||||||
#define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
|
#define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifndef Z_CLEARANCE_BETWEEN_PROBES
|
|
||||||
#define Z_CLEARANCE_BETWEEN_PROBES Z_HOMING_HEIGHT
|
#if PROBE_SELECTED
|
||||||
#endif
|
#ifndef Z_CLEARANCE_BETWEEN_PROBES
|
||||||
#if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
|
#define Z_CLEARANCE_BETWEEN_PROBES Z_HOMING_HEIGHT
|
||||||
#define MANUAL_PROBE_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
|
#endif
|
||||||
#else
|
#if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
|
||||||
#define MANUAL_PROBE_HEIGHT Z_HOMING_HEIGHT
|
#define MANUAL_PROBE_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
|
||||||
|
#else
|
||||||
|
#define MANUAL_PROBE_HEIGHT Z_HOMING_HEIGHT
|
||||||
|
#endif
|
||||||
|
#ifndef Z_CLEARANCE_MULTI_PROBE
|
||||||
|
#define Z_CLEARANCE_MULTI_PROBE Z_CLEARANCE_BETWEEN_PROBES
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Updated G92 behavior shifts the workspace
|
// Updated G92 behavior shifts the workspace
|
||||||
|
@ -779,6 +779,7 @@
|
|||||||
*/
|
*/
|
||||||
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
|
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
|
||||||
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
|
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
|
||||||
|
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
|
||||||
//#define Z_AFTER_PROBING 5 // Z position after probing is done
|
//#define Z_AFTER_PROBING 5 // Z position after probing is done
|
||||||
|
|
||||||
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
|
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
|
||||||
|
@ -2294,7 +2294,7 @@ void clean_up_after_endstop_or_probe_move() {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// move up to make clearance for the probe
|
// move up to make clearance for the probe
|
||||||
do_blocking_move_to_z(current_position[Z_AXIS] + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
|
do_blocking_move_to_z(current_position[Z_AXIS] + Z_CLEARANCE_MULTI_PROBE, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
@ -2328,7 +2328,7 @@ void clean_up_after_endstop_or_probe_move() {
|
|||||||
|
|
||||||
#if MULTIPLE_PROBING > 2
|
#if MULTIPLE_PROBING > 2
|
||||||
probes_total += current_position[Z_AXIS];
|
probes_total += current_position[Z_AXIS];
|
||||||
if (p > 1) do_blocking_move_to_z(current_position[Z_AXIS] + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
|
if (p > 1) do_blocking_move_to_z(current_position[Z_AXIS] + Z_CLEARANCE_MULTI_PROBE, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user