Skip to content

Commit e2d8b2f

Browse files
committed
🚸 Prefer probe XY feedrate for "blocking move"
Reverting part of 89b0143
1 parent 3e8483d commit e2d8b2f

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

Marlin/src/module/motion.cpp

+11-6
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ void do_blocking_move_to(NUM_AXIS_ARGS_(const_float_t) const_feedRate_t fr_mm_s/
11251125
if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", NUM_AXIS_ARGS_LC());
11261126
#endif
11271127

1128-
const feedRate_t xy_feedrate = fr_mm_s ?: feedRate_t(PLANNER_XY_FEEDRATE_MM_S);
1128+
const feedRate_t xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
11291129

11301130
#if HAS_Z_AXIS
11311131
const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);
@@ -1213,7 +1213,8 @@ void do_blocking_move_to(NUM_AXIS_ARGS_(const_float_t) const_feedRate_t fr_mm_s/
12131213
}
12141214

12151215
void do_blocking_move_to(const xy_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
1216-
do_blocking_move_to(NUM_AXIS_LIST_(raw.x, raw.y, current_position.z, current_position.i, current_position.j, current_position.k,
1216+
do_blocking_move_to(NUM_AXIS_LIST_(raw.x, raw.y, current_position.z,
1217+
current_position.i, current_position.j, current_position.k,
12171218
current_position.u, current_position.v, current_position.w) fr_mm_s);
12181219
}
12191220
void do_blocking_move_to(const xyz_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
@@ -1227,7 +1228,8 @@ void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*
12271228
void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
12281229
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("do_blocking_move_to_x(", rx, ", ", fr_mm_s, ")");
12291230
do_blocking_move_to(
1230-
NUM_AXIS_LIST_(rx, current_position.y, current_position.z, current_position.i, current_position.j, current_position.k,
1231+
NUM_AXIS_LIST_(rx, current_position.y, current_position.z,
1232+
current_position.i, current_position.j, current_position.k,
12311233
current_position.u, current_position.v, current_position.w)
12321234
fr_mm_s
12331235
);
@@ -1238,15 +1240,17 @@ void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*
12381240
void do_blocking_move_to_y(const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
12391241
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("do_blocking_move_to_y(", ry, ", ", fr_mm_s, ")");
12401242
do_blocking_move_to(
1241-
NUM_AXIS_LIST_(current_position.x, ry, current_position.z, current_position.i, current_position.j, current_position.k,
1243+
NUM_AXIS_LIST_(current_position.x, ry, current_position.z,
1244+
current_position.i, current_position.j, current_position.k,
12421245
current_position.u, current_position.v, current_position.w)
12431246
fr_mm_s
12441247
);
12451248
}
12461249
void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
12471250
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("do_blocking_move_to_xy(", rx, ", ", ry, ", ", fr_mm_s, ")");
12481251
do_blocking_move_to(
1249-
NUM_AXIS_LIST_(rx, ry, current_position.z, current_position.i, current_position.j, current_position.k,
1252+
NUM_AXIS_LIST_(rx, ry, current_position.z,
1253+
current_position.i, current_position.j, current_position.k,
12501254
current_position.u, current_position.v, current_position.w)
12511255
fr_mm_s
12521256
);
@@ -1263,7 +1267,8 @@ void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*
12631267
}
12641268
void do_blocking_move_to_xy_z(const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s/*=0.0f*/) {
12651269
do_blocking_move_to(
1266-
NUM_AXIS_LIST_(raw.x, raw.y, z, current_position.i, current_position.j, current_position.k,
1270+
NUM_AXIS_LIST_(raw.x, raw.y, z,
1271+
current_position.i, current_position.j, current_position.k,
12671272
current_position.u, current_position.v, current_position.w)
12681273
fr_mm_s
12691274
);

0 commit comments

Comments
 (0)