bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Option to force X or Y to home first when homing the other axis

Browse Source
This commit is contained in:
Kevin
2018-02-16 16:59:44 +01:00
committed by Scott Lahteine
parent 60fc372211
commit 9019ea0fce
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/gcode/calibrate/G28.cpp
View File

@ -227,10 +227,14 @@ void GcodeSuite::G28(const bool always_home_all) {
#endif
// Home Y (before X)
#if ENABLED(HOME_Y_BEFORE_X)
// Home Y
if (home_all || homeY) {
if (home_all || homeY
#if ENABLED(CODEPENDENT_XY_HOMING)
|| homeX
#endif
) {
HOMEAXIS(Y);
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS("> homeY", current_position);
@ -240,7 +244,11 @@ void GcodeSuite::G28(const bool always_home_all) {
#endif
// Home X
if (home_all || homeX) {
if (home_all || homeX
#if ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X)
|| homeY
#endif
) {
#if ENABLED(DUAL_X_CARRIAGE)
@ -271,8 +279,8 @@ void GcodeSuite::G28(const bool always_home_all) {
#endif
}
// Home Y (after X)
#if DISABLED(HOME_Y_BEFORE_X)
// Home Y
if (home_all || homeY) {
HOMEAXIS(Y);
#if ENABLED(DEBUG_LEVELING_FEATURE)