Skip to content

Commit 9130f58

Browse files
committed
🐛 Prevent ABL G29 setting a funky feedrate
See MarlinFirmware#22472
1 parent 0e06557 commit 9130f58

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Marlin/src/gcode/bedlevel/abl/G29.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,8 @@ G29_TYPE GcodeSuite::G29() {
363363
#if ABL_USES_GRID
364364

365365
xy_probe_feedrate_mm_s = MMM_TO_MMS(parser.linearval('S', XY_PROBE_FEEDRATE));
366+
if (!xy_probe_feedrate_mm_s) xy_probe_feedrate_mm_s = PLANNER_XY_FEEDRATE();
367+
NOLESS(xy_probe_feedrate_mm_s, planner.settings.min_feedrate_mm_s);
366368

367369
const float x_min = probe.min_x(), x_max = probe.max_x(),
368370
y_min = probe.min_y(), y_max = probe.max_y();

Marlin/src/module/motion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
483483
DEBUG_SECTION(log_move, "do_blocking_move_to", DEBUGGING(LEVELING));
484484
if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_ARGS());
485485

486-
const feedRate_t xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
486+
const feedRate_t xy_feedrate = fr_mm_s ?: PLANNER_XY_FEEDRATE();
487487

488488
#if HAS_Z_AXIS
489489
const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);

0 commit comments

Comments
 (0)