|
@@ -287,6 +287,8 @@ void do_blocking_move_to(const float &rx, const float &ry, const float &rz, cons
|
287
|
287
|
if (DEBUGGING(LEVELING)) print_xyz(PSTR(">>> do_blocking_move_to"), NULL, rx, ry, rz);
|
288
|
288
|
#endif
|
289
|
289
|
|
|
290
|
+ const float z_feedrate = fr_mm_s ? fr_mm_s : homing_feedrate(Z_AXIS);
|
|
291
|
+
|
290
|
292
|
#if ENABLED(DELTA)
|
291
|
293
|
|
292
|
294
|
if (!position_is_reachable(rx, ry)) return;
|
|
@@ -311,18 +313,16 @@ void do_blocking_move_to(const float &rx, const float &ry, const float &rz, cons
|
311
|
313
|
#endif
|
312
|
314
|
return;
|
313
|
315
|
}
|
314
|
|
- else {
|
315
|
|
- destination[Z_AXIS] = delta_clip_start_height;
|
316
|
|
- prepare_uninterpolated_move_to_destination(); // set_current_from_destination()
|
317
|
|
- #if ENABLED(DEBUG_LEVELING_FEATURE)
|
318
|
|
- if (DEBUGGING(LEVELING)) DEBUG_POS("zone border move", current_position);
|
319
|
|
- #endif
|
320
|
|
- }
|
|
316
|
+ destination[Z_AXIS] = delta_clip_start_height;
|
|
317
|
+ prepare_uninterpolated_move_to_destination(); // set_current_from_destination()
|
|
318
|
+ #if ENABLED(DEBUG_LEVELING_FEATURE)
|
|
319
|
+ if (DEBUGGING(LEVELING)) DEBUG_POS("zone border move", current_position);
|
|
320
|
+ #endif
|
321
|
321
|
}
|
322
|
322
|
|
323
|
323
|
if (rz > current_position[Z_AXIS]) { // raising?
|
324
|
324
|
destination[Z_AXIS] = rz;
|
325
|
|
- prepare_uninterpolated_move_to_destination(); // set_current_from_destination()
|
|
325
|
+ prepare_uninterpolated_move_to_destination(z_feedrate); // set_current_from_destination()
|
326
|
326
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
327
|
327
|
if (DEBUGGING(LEVELING)) DEBUG_POS("z raise move", current_position);
|
328
|
328
|
#endif
|
|
@@ -337,7 +337,7 @@ void do_blocking_move_to(const float &rx, const float &ry, const float &rz, cons
|
337
|
337
|
|
338
|
338
|
if (rz < current_position[Z_AXIS]) { // lowering?
|
339
|
339
|
destination[Z_AXIS] = rz;
|
340
|
|
- prepare_uninterpolated_move_to_destination(); // set_current_from_destination()
|
|
340
|
+ prepare_uninterpolated_move_to_destination(z_feedrate); // set_current_from_destination()
|
341
|
341
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
342
|
342
|
if (DEBUGGING(LEVELING)) DEBUG_POS("z lower move", current_position);
|
343
|
343
|
#endif
|
|
@@ -352,7 +352,7 @@ void do_blocking_move_to(const float &rx, const float &ry, const float &rz, cons
|
352
|
352
|
// If Z needs to raise, do it before moving XY
|
353
|
353
|
if (destination[Z_AXIS] < rz) {
|
354
|
354
|
destination[Z_AXIS] = rz;
|
355
|
|
- prepare_uninterpolated_move_to_destination(fr_mm_s ? fr_mm_s : homing_feedrate(Z_AXIS));
|
|
355
|
+ prepare_uninterpolated_move_to_destination(z_feedrate);
|
356
|
356
|
}
|
357
|
357
|
|
358
|
358
|
destination[X_AXIS] = rx;
|
|
@@ -362,14 +362,14 @@ void do_blocking_move_to(const float &rx, const float &ry, const float &rz, cons
|
362
|
362
|
// If Z needs to lower, do it after moving XY
|
363
|
363
|
if (destination[Z_AXIS] > rz) {
|
364
|
364
|
destination[Z_AXIS] = rz;
|
365
|
|
- prepare_uninterpolated_move_to_destination(fr_mm_s ? fr_mm_s : homing_feedrate(Z_AXIS));
|
|
365
|
+ prepare_uninterpolated_move_to_destination(z_feedrate);
|
366
|
366
|
}
|
367
|
367
|
|
368
|
368
|
#else
|
369
|
369
|
|
370
|
370
|
// If Z needs to raise, do it before moving XY
|
371
|
371
|
if (current_position[Z_AXIS] < rz) {
|
372
|
|
- feedrate_mm_s = fr_mm_s ? fr_mm_s : homing_feedrate(Z_AXIS);
|
|
372
|
+ feedrate_mm_s = z_feedrate;
|
373
|
373
|
current_position[Z_AXIS] = rz;
|
374
|
374
|
line_to_current_position();
|
375
|
375
|
}
|
|
@@ -381,7 +381,7 @@ void do_blocking_move_to(const float &rx, const float &ry, const float &rz, cons
|
381
|
381
|
|
382
|
382
|
// If Z needs to lower, do it after moving XY
|
383
|
383
|
if (current_position[Z_AXIS] > rz) {
|
384
|
|
- feedrate_mm_s = fr_mm_s ? fr_mm_s : homing_feedrate(Z_AXIS);
|
|
384
|
+ feedrate_mm_s = z_feedrate;
|
385
|
385
|
current_position[Z_AXIS] = rz;
|
386
|
386
|
line_to_current_position();
|
387
|
387
|
}
|