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

Lose the old HOMEAXIS macro

Browse Source
This commit is contained in:
Scott Lahteine 2018-06-30 18:07:40 -05:00
parent ca6ddbc555
commit c4fbbcaf46
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/Marlin_main.cpp
View File

@ -3043,8 +3043,6 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
* before updating the current position. * before updating the current position.
*/ */
#define HOMEAXIS(A) homeaxis(_AXIS(A))
static void homeaxis(const AxisEnum axis) { static void homeaxis(const AxisEnum axis) {
#if IS_SCARA #if IS_SCARA
@ -3944,9 +3942,9 @@ inline void gcode_G4() {
// At least one carriage has reached the top. // At least one carriage has reached the top.
// Now re-home each carriage separately. // Now re-home each carriage separately.
HOMEAXIS(A); homeaxis(A_AXIS);
HOMEAXIS(B); homeaxis(B_AXIS);
HOMEAXIS(C); homeaxis(C_AXIS);
// Set all carriages to their home positions // Set all carriages to their home positions
// Do this here all at once for Delta, because // Do this here all at once for Delta, because
@ -4020,7 +4018,7 @@ inline void gcode_G4() {
#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);
@ -4138,7 +4136,7 @@ inline void gcode_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
@ -4176,7 +4174,7 @@ inline void gcode_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
@ -4191,14 +4189,14 @@ inline void gcode_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);
@ -4207,14 +4205,14 @@ inline void gcode_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
@ -4223,7 +4221,7 @@ inline void gcode_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)