-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
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.
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
Unify run_z_probe #4343
Unify run_z_probe #4343
Conversation
@@ -2475,7 +2424,7 @@ static void homeaxis(AxisEnum axis) { | |||
DEBUG_POS("", current_position); | |||
} | |||
#endif | |||
do_blocking_move_to_axis_pos(axis, endstop_adj[axis], set_homing_bump_feedrate(axis)); | |||
do_blocking_move_to_axis_pos(axis, endstop_adj[axis], get_homing_bump_feedrate(axis)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like now this should be…
line_to_axis_pos(axis, endstop_adj[axis], get_homing_bump_feedrate(axis));
I rebased this on the latest code, then decided to make another tweak. Namely, it seems best not to include // Proportion of homing speed for the first approach when probing
#define Z_PROBE_FACTOR_FAST 1
// Proportion of homing speed for the second approach when probing
#define Z_PROBE_FACTOR_SLOW 0.5 |
5a65c15
to
8d0255c
Compare
Changing to factor here would (for me) be repeating the same error. Why |
8d0255c
to
2d8eeb2
Compare
I understand the point. But we cannot have (any more) configuration options that use named variables from the source code. So it has to be an absolute value or a factor related to some other reference speed. Too bad the feedrates aren't all specified in one place. #define HOMING_FEEDRATE_XY 50*60
#define HOMING_FEEDRATE_Z 4*60
#define HOMING_FEEDRATE {HOMING_FEEDRATE_XY, HOMING_FEEDRATE_XY, HOMING_FEEDRATE_Z, 0} // set the homing speeds (mm/min)
. . .
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
#define Z_PROBE_SPEED_SLOW HOMING_FEEDRATE_Z / 2 |
Unify run_z_probe Add double touch for DELTAs. Introduce Z_PROBE_SPEED_FAST and Z_PROBE_SPEED_SLOW defaulting to homing_feedrate_mm_m[Z_AXIS] and homing_feedrate_mm_m[Z_AXIS]/2
Looks good to me. But i already hear Roxy moaning about to big changes in the configs. The structure and order of the configs needs some more discussion, i think. |
Too many options? All out of order? Organization would be good! |
Ready to merge #4356 |
…lations Update Version and Translations for 3.13.1
Unify run_z_probe
Implicates double touch for DELTAs when probing.
Introduce Z_PROBE_SPEED_FAST and Z_PROBE_SPEED_SLOW,
defaulting to homing_feedrate_mm_m[Z_AXIS] and homing_feedrate_mm_m[Z_AXIS]/2
#4261