From a151d15ce855df5265f2c67d0b1d636a659f50d3 Mon Sep 17 00:00:00 2001 From: Speaka <48431623+Speaka@users.noreply.github.com> Date: Sat, 7 Nov 2020 14:54:44 +0100 Subject: [PATCH 1/4] clear after probing --- Marlin/Configuration_adv.h | 1 + Marlin/src/lcd/menu/menu_tramming.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index cd8a055ffb20..8b27552bce2c 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -811,6 +811,7 @@ //#define ASSISTED_TRAMMING_MENU_ITEM // Add a menu item to run G35 Assisted Tramming (MarlinUI) //#define ASSISTED_TRAMMING_WIZARD // Make the menu item open a Tramming Wizard sub-menu + //#define ASSISTED_TRAMMING_CLEAR_POSITION { X_CENTER, Y_CENTER, 30 } // Clear position for nozzle to reach bed screws /** * Screw thread: diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp index c01f983833ea..0d3de91c1b25 100644 --- a/Marlin/src/lcd/menu/menu_tramming.cpp +++ b/Marlin/src/lcd/menu/menu_tramming.cpp @@ -46,6 +46,12 @@ bool probe_single_point() { const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], PROBE_PT_RAISE, 0, true); DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm"); z_measured[tram_index] = z_probed_height; + #ifdef ASSISTED_TRAMMING_CLEAR_POSITION + // Move XY to safe position + if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Clearing Probing Point"); + const xyz_pos_t safe_pos = ASSISTED_TRAMMING_CLEAR_POSITION; + do_blocking_move_to(safe_pos, MMM_TO_MMS(XY_PROBE_FEEDRATE_MM_S)); + #endif return !isnan(z_probed_height); } From a58fcdfa5f6fb269eecced7700b103f09d982b69 Mon Sep 17 00:00:00 2001 From: Speaka <48431623+Speaka@users.noreply.github.com> Date: Sat, 7 Nov 2020 15:30:05 +0100 Subject: [PATCH 2/4] update feedrate --- Marlin/src/lcd/menu/menu_tramming.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp index 0d3de91c1b25..e17321c917b4 100644 --- a/Marlin/src/lcd/menu/menu_tramming.cpp +++ b/Marlin/src/lcd/menu/menu_tramming.cpp @@ -50,7 +50,7 @@ bool probe_single_point() { // Move XY to safe position if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Clearing Probing Point"); const xyz_pos_t safe_pos = ASSISTED_TRAMMING_CLEAR_POSITION; - do_blocking_move_to(safe_pos, MMM_TO_MMS(XY_PROBE_FEEDRATE_MM_S)); + do_blocking_move_to(safe_pos, XY_PROBE_FEEDRATE_MM_S); #endif return !isnan(z_probed_height); } From 0a5eef70b26b7f83ce8749de0a5c57955f7ff318 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 9 Nov 2020 00:57:54 -0600 Subject: [PATCH 3/4] Tweak name --- Marlin/Configuration_adv.h | 2 +- Marlin/src/lcd/menu/menu_tramming.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 8b27552bce2c..80a03b463754 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -811,7 +811,7 @@ //#define ASSISTED_TRAMMING_MENU_ITEM // Add a menu item to run G35 Assisted Tramming (MarlinUI) //#define ASSISTED_TRAMMING_WIZARD // Make the menu item open a Tramming Wizard sub-menu - //#define ASSISTED_TRAMMING_CLEAR_POSITION { X_CENTER, Y_CENTER, 30 } // Clear position for nozzle to reach bed screws + //#define ASSISTED_TRAMMING_SAFE_POSITION { X_CENTER, Y_CENTER, 30 } // Clear position for nozzle to reach bed screws /** * Screw thread: diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp index e17321c917b4..ae2e77750d2d 100644 --- a/Marlin/src/lcd/menu/menu_tramming.cpp +++ b/Marlin/src/lcd/menu/menu_tramming.cpp @@ -46,10 +46,10 @@ bool probe_single_point() { const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], PROBE_PT_RAISE, 0, true); DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm"); z_measured[tram_index] = z_probed_height; - #ifdef ASSISTED_TRAMMING_CLEAR_POSITION + #ifdef ASSISTED_TRAMMING_SAFE_POSITION // Move XY to safe position if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Clearing Probing Point"); - const xyz_pos_t safe_pos = ASSISTED_TRAMMING_CLEAR_POSITION; + const xyz_pos_t safe_pos = ASSISTED_TRAMMING_SAFE_POSITION; do_blocking_move_to(safe_pos, XY_PROBE_FEEDRATE_MM_S); #endif return !isnan(z_probed_height); From 16eccf9947c3a4550180935f94476a416822be20 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 9 Nov 2020 01:02:55 -0600 Subject: [PATCH 4/4] Couch as wait position --- Marlin/Configuration_adv.h | 2 +- Marlin/src/lcd/menu/menu_tramming.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 80a03b463754..ba56862d5dbf 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -811,7 +811,7 @@ //#define ASSISTED_TRAMMING_MENU_ITEM // Add a menu item to run G35 Assisted Tramming (MarlinUI) //#define ASSISTED_TRAMMING_WIZARD // Make the menu item open a Tramming Wizard sub-menu - //#define ASSISTED_TRAMMING_SAFE_POSITION { X_CENTER, Y_CENTER, 30 } // Clear position for nozzle to reach bed screws + //#define ASSISTED_TRAMMING_WAIT_POSITION { X_CENTER, Y_CENTER, 30 } // Move the nozzle out of the way for adjustment /** * Screw thread: diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp index ae2e77750d2d..c4cca6ad810f 100644 --- a/Marlin/src/lcd/menu/menu_tramming.cpp +++ b/Marlin/src/lcd/menu/menu_tramming.cpp @@ -46,12 +46,14 @@ bool probe_single_point() { const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], PROBE_PT_RAISE, 0, true); DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm"); z_measured[tram_index] = z_probed_height; - #ifdef ASSISTED_TRAMMING_SAFE_POSITION + + #ifdef ASSISTED_TRAMMING_WAIT_POSITION // Move XY to safe position - if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Clearing Probing Point"); - const xyz_pos_t safe_pos = ASSISTED_TRAMMING_SAFE_POSITION; - do_blocking_move_to(safe_pos, XY_PROBE_FEEDRATE_MM_S); + if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Moving away"); + const xyz_pos_t wait_pos = ASSISTED_TRAMMING_WAIT_POSITION; + do_blocking_move_to(wait_pos, XY_PROBE_FEEDRATE_MM_S); #endif + return !isnan(z_probed_height); }