|
@ -129,7 +129,7 @@ |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
do_blocking_move_to_xy(destination[X_AXIS], destination[Y_AXIS]); |
|
|
do_blocking_move_to_xy(destination[X_AXIS], destination[Y_AXIS]); |
|
|
HOMEAXIS(Z); |
|
|
homeaxis(Z_AXIS); |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
LCD_MESSAGEPGM(MSG_ZPROBE_OUT); |
|
|
LCD_MESSAGEPGM(MSG_ZPROBE_OUT); |
|
@ -241,7 +241,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) HOMEAXIS(Z); |
|
|
if (home_all || homeZ) homeaxis(Z_AXIS); |
|
|
|
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
@ -279,7 +279,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_AXIS); |
|
|
|
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
@ -294,14 +294,14 @@ void GcodeSuite::G28(const bool always_home_all) { |
|
|
|
|
|
|
|
|
// Always home the 2nd (right) extruder first
|
|
|
// Always home the 2nd (right) extruder first
|
|
|
active_extruder = 1; |
|
|
active_extruder = 1; |
|
|
HOMEAXIS(X); |
|
|
homeaxis(X_AXIS); |
|
|
|
|
|
|
|
|
// Remember this extruder's position for later tool change
|
|
|
// Remember this extruder's position for later tool change
|
|
|
inactive_extruder_x_pos = current_position[X_AXIS]; |
|
|
inactive_extruder_x_pos = current_position[X_AXIS]; |
|
|
|
|
|
|
|
|
// Home the 1st (left) extruder
|
|
|
// Home the 1st (left) extruder
|
|
|
active_extruder = 0; |
|
|
active_extruder = 0; |
|
|
HOMEAXIS(X); |
|
|
homeaxis(X_AXIS); |
|
|
|
|
|
|
|
|
// Consider the active extruder to be parked
|
|
|
// Consider the active extruder to be parked
|
|
|
COPY(raised_parked_position, current_position); |
|
|
COPY(raised_parked_position, current_position); |
|
@ -310,14 +310,14 @@ void GcodeSuite::G28(const bool always_home_all) { |
|
|
|
|
|
|
|
|
#else |
|
|
#else |
|
|
|
|
|
|
|
|
HOMEAXIS(X); |
|
|
homeaxis(X_AXIS); |
|
|
|
|
|
|
|
|
#endif |
|
|
#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) HOMEAXIS(Y); |
|
|
if (home_all || homeY) homeaxis(Y_AXIS); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
// Home Z last if homing towards the bed
|
|
|
// Home Z last if homing towards the bed
|
|
@ -326,7 +326,7 @@ void GcodeSuite::G28(const bool always_home_all) { |
|
|
#if ENABLED(Z_SAFE_HOMING) |
|
|
#if ENABLED(Z_SAFE_HOMING) |
|
|
home_z_safely(); |
|
|
home_z_safely(); |
|
|
#else |
|
|
#else |
|
|
HOMEAXIS(Z); |
|
|
homeaxis(Z_AXIS); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING) |
|
|
#if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING) |
|
|