|
@ -198,12 +198,7 @@ void GcodeSuite::G28(const bool always_home_all) { |
|
|
|
|
|
|
|
|
#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 || homeZ) { |
|
|
if (home_all || homeZ) HOMEAXIS(Z); |
|
|
HOMEAXIS(Z); |
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE) |
|
|
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_POS("> HOMEAXIS(Z)", current_position); |
|
|
|
|
|
#endif |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
@ -234,12 +229,7 @@ void GcodeSuite::G28(const bool always_home_all) { |
|
|
#if ENABLED(CODEPENDENT_XY_HOMING) |
|
|
#if ENABLED(CODEPENDENT_XY_HOMING) |
|
|
|| homeX |
|
|
|| homeX |
|
|
#endif |
|
|
#endif |
|
|
) { |
|
|
) HOMEAXIS(Y); |
|
|
HOMEAXIS(Y); |
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE) |
|
|
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_POS("> homeY", current_position); |
|
|
|
|
|
#endif |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
@ -273,20 +263,11 @@ void GcodeSuite::G28(const bool always_home_all) { |
|
|
HOMEAXIS(X); |
|
|
HOMEAXIS(X); |
|
|
|
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE) |
|
|
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_POS("> homeX", current_position); |
|
|
|
|
|
#endif |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Home Y (after X)
|
|
|
// Home Y (after X)
|
|
|
#if DISABLED(HOME_Y_BEFORE_X) |
|
|
#if DISABLED(HOME_Y_BEFORE_X) |
|
|
if (home_all || homeY) { |
|
|
if (home_all || homeY) HOMEAXIS(Y); |
|
|
HOMEAXIS(Y); |
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE) |
|
|
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_POS("> homeY", current_position); |
|
|
|
|
|
#endif |
|
|
|
|
|
} |
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
// Home Z last if homing towards the bed
|
|
|
// Home Z last if homing towards the bed
|
|
@ -297,9 +278,6 @@ void GcodeSuite::G28(const bool always_home_all) { |
|
|
#else |
|
|
#else |
|
|
HOMEAXIS(Z); |
|
|
HOMEAXIS(Z); |
|
|
#endif |
|
|
#endif |
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE) |
|
|
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_POS("> (home_all || homeZ) > final", current_position); |
|
|
|
|
|
#endif |
|
|
|
|
|
} // home_all || homeZ
|
|
|
} // home_all || homeZ
|
|
|
#endif // Z_HOME_DIR < 0
|
|
|
#endif // Z_HOME_DIR < 0
|
|
|
|
|
|
|
|
|