Browse Source

🐛 Prevent ABL G29 setting a funky feedrate

See #22472
Scott Lahteine 2 years ago
parent
commit
9130f58f3f
2 changed files with 3 additions and 1 deletions
  1. 2
    0
      Marlin/src/gcode/bedlevel/abl/G29.cpp
  2. 1
    1
      Marlin/src/module/motion.cpp

+ 2
- 0
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

@@ -363,6 +363,8 @@ G29_TYPE GcodeSuite::G29() {
363 363
     #if ABL_USES_GRID
364 364
 
365 365
       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);
366 368
 
367 369
       const float x_min = probe.min_x(), x_max = probe.max_x(),
368 370
                   y_min = probe.min_y(), y_max = probe.max_y();

+ 1
- 1
Marlin/src/module/motion.cpp View File

@@ -483,7 +483,7 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
483 483
   DEBUG_SECTION(log_move, "do_blocking_move_to", DEBUGGING(LEVELING));
484 484
   if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_ARGS());
485 485
 
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();
487 487
 
488 488
   #if HAS_Z_AXIS
489 489
     const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);

Loading…
Cancel
Save