Browse Source

Merge pull request #5258 from mosh1/mbl_speed_fix

Fix z feedrate value when doing mesh bed leveling. probe feedrate use…
Scott Lahteine 8 years ago
parent
commit
d891324830
2 changed files with 4 additions and 2 deletions
  1. 3
    1
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/ultralcd.cpp

+ 3
- 1
Marlin/Marlin_main.cpp View File

@@ -3522,7 +3522,7 @@ inline void gcode_G28() {
3522 3522
 
3523 3523
   inline void _mbl_goto_xy(float x, float y) {
3524 3524
     float old_feedrate_mm_s = feedrate_mm_s;
3525
-    feedrate_mm_s = homing_feedrate_mm_s[X_AXIS];
3525
+    feedrate_mm_s = homing_feedrate_mm_s[Z_AXIS];
3526 3526
 
3527 3527
     current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3528 3528
       #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
@@ -3533,11 +3533,13 @@ inline void gcode_G28() {
3533 3533
     ;
3534 3534
     line_to_current_position();
3535 3535
 
3536
+    feedrate_mm_s = MMM_TO_MMS(XY_PROBE_SPEED);
3536 3537
     current_position[X_AXIS] = LOGICAL_X_POSITION(x);
3537 3538
     current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
3538 3539
     line_to_current_position();
3539 3540
 
3540 3541
     #if Z_CLEARANCE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0
3542
+      feedrate_mm_s = homing_feedrate_mm_s[Z_AXIS];
3541 3543
       current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
3542 3544
       line_to_current_position();
3543 3545
     #endif

+ 1
- 1
Marlin/ultralcd.cpp View File

@@ -1041,7 +1041,7 @@ void kill_screen(const char* lcd_msg) {
1041 1041
       line_to_current(Z_AXIS);
1042 1042
       current_position[X_AXIS] = LOGICAL_X_POSITION(x);
1043 1043
       current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
1044
-      line_to_current(manual_feedrate_mm_m[X_AXIS] <= manual_feedrate_mm_m[Y_AXIS] ? X_AXIS : Y_AXIS);
1044
+      planner.buffer_line_kinematic(current_position, MMM_TO_MMS(XY_PROBE_SPEED), active_extruder);
1045 1045
       #if Z_HOMING_HEIGHT > 0
1046 1046
         current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
1047 1047
         line_to_current(Z_AXIS);

Loading…
Cancel
Save