From a44b3432c16eec25d95d36fd919a4c358de83fc3 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Fri, 24 Mar 2017 11:23:00 -0500 Subject: [PATCH] add BLTouch retry to a second place & add/update delays ================================================= implement requested changes ================================================= remove delays (they're in another PR) & move return --- Marlin/Marlin_main.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index db35dedee..bdcc90365 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1993,6 +1993,19 @@ static void clean_up_after_endstop_or_probe_move() { } void set_bltouch_deployed(const bool deploy) { + if (deploy && TEST_BLTOUCH()) { // If BL-Touch says it's triggered + bltouch_command(BLTOUCH_RESET); // try to reset it. + bltouch_command(BLTOUCH_DEPLOY); // Also needs to deploy and stow to + bltouch_command(BLTOUCH_STOW); // clear the triggered condition. + safe_delay(1500); // wait for internal self test to complete + // measured completion time was 0.65 seconds + // after reset, deploy & stow sequence + if (TEST_BLTOUCH()) { // If it still claims to be triggered... + SERIAL_ERROR_START; + SERIAL_ERRORLNPGM(MSG_STOP_BLTOUCH); + stop(); // punt! + } + } bltouch_command(deploy ? BLTOUCH_DEPLOY : BLTOUCH_STOW); #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) { @@ -2023,8 +2036,11 @@ static void clean_up_after_endstop_or_probe_move() { #if ENABLED(BLTOUCH) if (deploy && TEST_BLTOUCH()) { // If BL-Touch says it's triggered bltouch_command(BLTOUCH_RESET); // try to reset it. - set_bltouch_deployed(true); // Also needs to deploy and stow to - set_bltouch_deployed(false); // clear the triggered condition. + bltouch_command(BLTOUCH_DEPLOY); // Also needs to deploy and stow to + bltouch_command(BLTOUCH_STOW); // clear the triggered condition. + safe_delay(1500); // wait for internal self test to complete + // measured completion time was 0.65 seconds + // after reset, deploy & stow sequence if (TEST_BLTOUCH()) { // If it still claims to be triggered... SERIAL_ERROR_START; SERIAL_ERRORLNPGM(MSG_STOP_BLTOUCH);