From 08459a003fbc3bf38e1128e047999c649347ef56 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 23 Jul 2016 00:58:53 -0700 Subject: [PATCH] Undo the self-sabotage that is do_blocking_move_to_axis_pos --- Marlin/Marlin.h | 2 -- Marlin/Marlin_main.cpp | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 251df9982f..3d097235ef 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -407,9 +407,7 @@ void calculate_volumetric_multipliers(); * Blocking movement and shorthand functions */ inline void do_blocking_move_to(float x, float y, float z, float fr_mm_m=0.0); -inline void do_blocking_move_to_axis_pos(AxisEnum axis, float where, float fr_mm_m=0.0); inline void do_blocking_move_to_x(float x, float fr_mm_m=0.0); -inline void do_blocking_move_to_y(float y); inline void do_blocking_move_to_z(float z, float fr_mm_m=0.0); inline void do_blocking_move_to_xy(float x, float y, float fr_mm_m=0.0); diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 72613a1aa7..f8b8e0df3f 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1755,15 +1755,15 @@ void do_blocking_move_to(float x, float y, float z, float fr_mm_m /*=0.0*/) { feedrate_mm_m = old_feedrate_mm_m; } - -void do_blocking_move_to_axis_pos(AxisEnum axis, float where, float fr_mm_m/*=0.0*/) { - current_position[axis] = where; - do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], fr_mm_m); +void do_blocking_move_to_x(float x, float fr_mm_m/*=0.0*/) { + do_blocking_move_to(x, current_position[Y_AXIS], current_position[Z_AXIS], fr_mm_m); +} +void do_blocking_move_to_z(float z, float fr_mm_m/*=0.0*/) { + do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z, fr_mm_m); +} +void do_blocking_move_to_xy(float x, float y, float fr_mm_m/*=0.0*/) { + do_blocking_move_to(x, y, current_position[Z_AXIS], fr_mm_m); } -void do_blocking_move_to_x(float x, float fr_mm_m/*=0.0*/) { do_blocking_move_to_axis_pos(X_AXIS, x, fr_mm_m); } -void do_blocking_move_to_y(float y) { do_blocking_move_to_axis_pos(Y_AXIS, y); } -void do_blocking_move_to_z(float z, float fr_mm_m/*=0.0*/) { do_blocking_move_to_axis_pos(Z_AXIS, z, fr_mm_m); } -void do_blocking_move_to_xy(float x, float y, float fr_mm_m/*=0.0*/) { do_blocking_move_to(x, y, current_position[Z_AXIS], fr_mm_m); } // // Prepare to do endstop or probe moves