From 43ad3cb6a048eceb6a45700b66d7556b63a42539 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Thu, 11 Jul 2019 23:27:14 -0400
Subject: [PATCH] Fix dual z issue

---
 Marlin/src/HAL/HAL_AVR/HAL.cpp      | 16 ++++++++--------
 Marlin/src/HAL/HAL_LPC1768/main.cpp |  8 ++++----
 Marlin/src/inc/Conditionals_post.h  |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/HAL/HAL_AVR/HAL.cpp b/Marlin/src/HAL/HAL_AVR/HAL.cpp
index 4e889080d0..058487feea 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL.cpp
+++ b/Marlin/src/HAL/HAL_AVR/HAL.cpp
@@ -37,17 +37,17 @@
 
 void HAL_init(void) {
   // Init Servo Pins
-  #if PIN_EXISTS(SERVO0)
-    //OUT_WRITE(SERVO0_PIN, LOW);
+  #if HAS_SERVO_0
+    OUT_WRITE(SERVO0_PIN, LOW);
   #endif
-  #if PIN_EXISTS(SERVO1)
-    //OUT_WRITE(SERVO1_PIN, LOW);
+  #if HAS_SERVO_1
+    OUT_WRITE(SERVO1_PIN, LOW);
   #endif
-  #if PIN_EXISTS(SERVO2)
-   //OUT_WRITE(SERVO2_PIN, LOW);
+  #if HAS_SERVO_2
+    OUT_WRITE(SERVO2_PIN, LOW);
   #endif
-  #if PIN_EXISTS(SERVO3)
-    //OUT_WRITE(SERVO3_PIN, LOW);
+  #if HAS_SERVO_3
+    OUT_WRITE(SERVO3_PIN, LOW);
   #endif
 }
 
diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp
index 03b8d419b2..7ee34840bc 100644
--- a/Marlin/src/HAL/HAL_LPC1768/main.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp
@@ -73,16 +73,16 @@ void HAL_init(void) {
   #endif
 
   // Init Servo Pins
-  #if PIN_EXISTS(SERVO0)
+  #if HAS_SERVO_0
     OUT_WRITE(SERVO0_PIN, LOW);
   #endif
-  #if PIN_EXISTS(SERVO1)
+  #if HAS_SERVO_1
     OUT_WRITE(SERVO1_PIN, LOW);
   #endif
-  #if PIN_EXISTS(SERVO2)
+  #if HAS_SERVO_2
     OUT_WRITE(SERVO2_PIN, LOW);
   #endif
-  #if PIN_EXISTS(SERVO3)
+  #if HAS_SERVO_3
     OUT_WRITE(SERVO3_PIN, LOW);
   #endif
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index afc22d260a..b26ace28dd 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1000,10 +1000,10 @@
 #define HAS_CONTROLLER_FAN (PIN_EXISTS(CONTROLLER_FAN))
 
 // Servos
-#define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
-#define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
-#define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
-#define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
+#define HAS_SERVO_0 ( PIN_EXISTS(SERVO0) && NUM_SERVOS > 0 )
+#define HAS_SERVO_1 ( PIN_EXISTS(SERVO1) && NUM_SERVOS > 1 )
+#define HAS_SERVO_2 ( PIN_EXISTS(SERVO2) && NUM_SERVOS > 2 )
+#define HAS_SERVO_3 ( PIN_EXISTS(SERVO3) && NUM_SERVOS > 3 )
 #define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0)
 
 #if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)