SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1748 from thinkyhead/raise_before_homing

Browse source 
Apply Z_RAISE_BEFORE_HOMING before homing XY
This commit is contained in:
Scott Lahteine 2015-03-30 23:37:41 -07:00
commit 50145266cd
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Marlin/Marlin_main.cpp
View file

@ -1803,7 +1803,19 @@ inline void gcode_G28() {
home_all_axis = !homeX && !homeY && !homeZ; // No parameters means home all axes home_all_axis = !homeX && !homeY && !homeZ; // No parameters means home all axes
#if Z_HOME_DIR > 0 // If homing away from BED do Z first #if Z_HOME_DIR > 0 // If homing away from BED do Z first
if (home_all_axis || homeZ) HOMEAXIS(Z); if (home_all_axis || homeZ) HOMEAXIS(Z);
#elif !defined(Z_SAFE_HOMING) && defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0
// Raise Z before homing any other axes
if (home_all_axis || homeZ) {
destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS); // Set destination away from bed
feedrate = max_feedrate[Z_AXIS];
line_to_destination();
st_synchronize();
}
#endif #endif
#ifdef QUICK_HOME #ifdef QUICK_HOME
@ -1897,16 +1909,7 @@ inline void gcode_G28() {
#ifndef Z_SAFE_HOMING #ifndef Z_SAFE_HOMING
if (home_all_axis || homeZ) { if (home_all_axis || homeZ) HOMEAXIS(Z);
// Raise Z before homing Z? Shouldn't this happen before homing X or Y?
#if defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0
destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS); // Set destination away from bed
feedrate = max_feedrate[Z_AXIS];
line_to_destination();
st_synchronize();
#endif
HOMEAXIS(Z);
}
#else // Z_SAFE_HOMING #else // Z_SAFE_HOMING