MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #5258 from mosh1/mbl_speed_fix

Browse Source 
Fix z feedrate value when doing mesh bed leveling. probe feedrate use…
This commit is contained in:
Scott Lahteine 2016-11-23 14:15:01 -06:00 committed by GitHub
commit d891324830
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -3522,7 +3522,7 @@ inline void gcode_G28() {
inline void _mbl_goto_xy(float x, float y) { inline void _mbl_goto_xy(float x, float y) {
float old_feedrate_mm_s = feedrate_mm_s; float old_feedrate_mm_s = feedrate_mm_s;
feedrate_mm_s = homing_feedrate_mm_s[X_AXIS]; feedrate_mm_s = homing_feedrate_mm_s[Z_AXIS];
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT #if Z_CLEARANCE_BETWEEN_PROBES > Z_HOMING_HEIGHT
@ -3533,11 +3533,13 @@ inline void gcode_G28() {
; ;
line_to_current_position(); line_to_current_position();
feedrate_mm_s = MMM_TO_MMS(XY_PROBE_SPEED);
current_position[X_AXIS] = LOGICAL_X_POSITION(x); current_position[X_AXIS] = LOGICAL_X_POSITION(x);
current_position[Y_AXIS] = LOGICAL_Y_POSITION(y); current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
line_to_current_position(); line_to_current_position();
#if Z_CLEARANCE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0 #if Z_CLEARANCE_BETWEEN_PROBES > 0 || Z_HOMING_HEIGHT > 0
feedrate_mm_s = homing_feedrate_mm_s[Z_AXIS];
current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z); current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
line_to_current_position(); line_to_current_position();
#endif #endif

2
Marlin/ultralcd.cpp
View File

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