Browse Source

Merge pull request #1177 from martin-pr/probing_z_speed

Split do_blocking_move() to XY and Z sections
Bo Herrmannsen 10 years ago
parent
commit
889d7ba218
1 changed files with 6 additions and 1 deletions
  1. 6
    1
      Marlin/Marlin_main.cpp

+ 6
- 1
Marlin/Marlin_main.cpp View File

1050
 static void do_blocking_move_to(float x, float y, float z) {
1050
 static void do_blocking_move_to(float x, float y, float z) {
1051
     float oldFeedRate = feedrate;
1051
     float oldFeedRate = feedrate;
1052
 
1052
 
1053
+    feedrate = homing_feedrate[Z_AXIS];
1054
+
1055
+    current_position[Z_AXIS] = z;
1056
+    plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate/60, active_extruder);
1057
+    st_synchronize();
1058
+
1053
     feedrate = XY_TRAVEL_SPEED;
1059
     feedrate = XY_TRAVEL_SPEED;
1054
 
1060
 
1055
     current_position[X_AXIS] = x;
1061
     current_position[X_AXIS] = x;
1056
     current_position[Y_AXIS] = y;
1062
     current_position[Y_AXIS] = y;
1057
-    current_position[Z_AXIS] = z;
1058
     plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate/60, active_extruder);
1063
     plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate/60, active_extruder);
1059
     st_synchronize();
1064
     st_synchronize();
1060
 
1065
 

Loading…
Cancel
Save