Skip to content

Commit

Permalink
Merge pull request MarlinFirmware#1177 from martin-pr/probing_z_speed
Browse files Browse the repository at this point in the history
Split do_blocking_move() to XY and Z sections
  • Loading branch information
boelle committed Dec 20, 2014
2 parents 5e7bd2d + 2ef0669 commit 889d7ba
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Marlin/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1050,11 +1050,16 @@ static void run_z_probe() {
static void do_blocking_move_to(float x, float y, float z) {
float oldFeedRate = feedrate;

feedrate = homing_feedrate[Z_AXIS];

current_position[Z_AXIS] = z;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate/60, active_extruder);
st_synchronize();

feedrate = XY_TRAVEL_SPEED;

current_position[X_AXIS] = x;
current_position[Y_AXIS] = y;
current_position[Z_AXIS] = z;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate/60, active_extruder);
st_synchronize();

Expand Down

0 comments on commit 889d7ba

Please sign in to comment.