From 869d7f370324b5d2439ec6ebb92d391127cc02f9 Mon Sep 17 00:00:00 2001 From: GMagician Date: Thu, 17 Aug 2017 21:43:47 +0200 Subject: [PATCH 1/3] #7504 missing part #7504 integration has missed this part. When more than 1 servo is used with bltouch it's impossible to predefine default servo delay for it. In my original fix I completely removed this part but maybe this is a better compromise --- Marlin/Conditionals_LCD.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index d36931662..69526dec7 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -376,8 +376,10 @@ #define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1) #endif #undef DEACTIVATE_SERVOS_AFTER_MOVE - #undef SERVO_DELAY - #define SERVO_DELAY { 50 } + #if NUM_SERVOS = 1 + #undef SERVO_DELAY + #define SERVO_DELAY { 50 } + #endif #ifndef BLTOUCH_DELAY #define BLTOUCH_DELAY 375 #endif From 405a2132f3ba3fd6dbbd2193434daecef95e664f Mon Sep 17 00:00:00 2001 From: GMagician Date: Thu, 17 Aug 2017 22:04:28 +0200 Subject: [PATCH 2/3] #7529 compile fix I made an error in previous fix --- Marlin/Conditionals_LCD.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 69526dec7..796caed56 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -376,7 +376,7 @@ #define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1) #endif #undef DEACTIVATE_SERVOS_AFTER_MOVE - #if NUM_SERVOS = 1 + #if NUM_SERVOS == 1 #undef SERVO_DELAY #define SERVO_DELAY { 50 } #endif From 6127154af3e76b0b4dc527c5eab075a90f6f48c8 Mon Sep 17 00:00:00 2001 From: GMagician Date: Fri, 18 Aug 2017 11:34:55 +0200 Subject: [PATCH 3/3] Fix identation by tab There was a tab instead of spaces --- Marlin/Conditionals_LCD.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 796caed56..171ca09ce 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -379,7 +379,7 @@ #if NUM_SERVOS == 1 #undef SERVO_DELAY #define SERVO_DELAY { 50 } - #endif + #endif #ifndef BLTOUCH_DELAY #define BLTOUCH_DELAY 375 #endif