From 888774cbc38a4467936a5bfa4dd94717814581ad Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 18 Jul 2018 21:03:08 -0500 Subject: [PATCH] Add MANUAL_PROBE_START_Z for manual probing --- Marlin/Configuration.h | 1 + Marlin/Marlin_main.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6cb849cbbb..0f1a0a0573 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -677,6 +677,7 @@ * or (with LCD_BED_LEVELING) the LCD controller. */ //#define PROBE_MANUALLY +//#define MANUAL_PROBE_START_Z 0.2 /** * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 0843796178..7745c0a2ab 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -4292,7 +4292,14 @@ void home_all_axes() { gcode_G28(true); } inline void _manual_goto_xy(const float &rx, const float &ry) { - #if MANUAL_PROBE_HEIGHT > 0 + #ifdef MANUAL_PROBE_START_Z + #if MANUAL_PROBE_HEIGHT > 0 + do_blocking_move_to(rx, ry, MANUAL_PROBE_HEIGHT); + do_blocking_move_to_z(MAX(0,MANUAL_PROBE_START_Z)); + #else + do_blocking_move_to(rx, ry, MAX(0,MANUAL_PROBE_START_Z)); + #endif + #elif MANUAL_PROBE_HEIGHT > 0 const float prev_z = current_position[Z_AXIS]; do_blocking_move_to(rx, ry, MANUAL_PROBE_HEIGHT); do_blocking_move_to_z(prev_z);