@@ -1125,7 +1125,7 @@ void do_blocking_move_to(NUM_AXIS_ARGS_(const_float_t) const_feedRate_t fr_mm_s/
1125
1125
if (DEBUGGING (LEVELING)) DEBUG_XYZ (" > " , NUM_AXIS_ARGS_LC ());
1126
1126
#endif
1127
1127
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 );
1129
1129
1130
1130
#if HAS_Z_AXIS
1131
1131
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/
1213
1213
}
1214
1214
1215
1215
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 ,
1217
1218
current_position.u , current_position.v , current_position.w ) fr_mm_s);
1218
1219
}
1219
1220
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*
1227
1228
void do_blocking_move_to_x (const_float_t rx, const_feedRate_t fr_mm_s/* =0.0*/ ) {
1228
1229
if (DEBUGGING (LEVELING)) DEBUG_ECHOLNPGM (" do_blocking_move_to_x(" , rx, " , " , fr_mm_s, " )" );
1229
1230
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 ,
1231
1233
current_position.u , current_position.v , current_position.w )
1232
1234
fr_mm_s
1233
1235
);
@@ -1238,15 +1240,17 @@ void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*
1238
1240
void do_blocking_move_to_y (const_float_t ry, const_feedRate_t fr_mm_s/* =0.0*/ ) {
1239
1241
if (DEBUGGING (LEVELING)) DEBUG_ECHOLNPGM (" do_blocking_move_to_y(" , ry, " , " , fr_mm_s, " )" );
1240
1242
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 ,
1242
1245
current_position.u , current_position.v , current_position.w )
1243
1246
fr_mm_s
1244
1247
);
1245
1248
}
1246
1249
void do_blocking_move_to_xy (const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s/* =0.0*/ ) {
1247
1250
if (DEBUGGING (LEVELING)) DEBUG_ECHOLNPGM (" do_blocking_move_to_xy(" , rx, " , " , ry, " , " , fr_mm_s, " )" );
1248
1251
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 ,
1250
1254
current_position.u , current_position.v , current_position.w )
1251
1255
fr_mm_s
1252
1256
);
@@ -1263,7 +1267,8 @@ void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*
1263
1267
}
1264
1268
void do_blocking_move_to_xy_z (const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s/* =0.0f*/ ) {
1265
1269
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 ,
1267
1272
current_position.u , current_position.v , current_position.w )
1268
1273
fr_mm_s
1269
1274
);
0 commit comments