From 23567a1d8b1d96dba4653bec0aa603c431ef36de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= <jbrazio@gmail.com>
Date: Thu, 5 May 2016 00:18:32 +0100
Subject: [PATCH] Moved DELTA radius/rod default trimmer values to
 Conditionals.h

---
 Marlin/Conditionals.h | 24 ++++++++++++++++++++++++
 Marlin/Marlin.h       | 18 ------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index 3a30500b3..605a8de2e 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -751,5 +751,29 @@
     #define HAS_Z_MIN_PROBE
   #endif
 
+  /**
+   * Delta radius/rod trimmers
+   */
+  #if ENABLED(DELTA)
+    #ifndef DELTA_RADIUS_TRIM_TOWER_1
+      #define DELTA_RADIUS_TRIM_TOWER_1 0.0
+    #endif
+    #ifndef DELTA_RADIUS_TRIM_TOWER_2
+      #define DELTA_RADIUS_TRIM_TOWER_2 0.0
+    #endif
+    #ifndef DELTA_RADIUS_TRIM_TOWER_3
+      #define DELTA_RADIUS_TRIM_TOWER_3 0.0
+    #endif
+    #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_1
+      #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
+    #endif
+    #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_2
+      #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
+    #endif
+    #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_3
+      #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
+    #endif
+  #endif
+
 #endif //CONFIGURATION_LCD
 #endif //CONDITIONALS_H
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index f6f488df8..b8b90b772 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -290,24 +290,6 @@ extern long code_value_long();
 extern int16_t code_value_short();
 
 #if ENABLED(DELTA)
-  #ifndef DELTA_RADIUS_TRIM_TOWER_1
-    #define DELTA_RADIUS_TRIM_TOWER_1 0.0
-  #endif
-  #ifndef DELTA_RADIUS_TRIM_TOWER_2
-    #define DELTA_RADIUS_TRIM_TOWER_2 0.0
-  #endif
-  #ifndef DELTA_RADIUS_TRIM_TOWER_3
-    #define DELTA_RADIUS_TRIM_TOWER_3 0.0
-  #endif
-  #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_1
-    #define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
-  #endif
-  #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_2
-    #define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
-  #endif
-  #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_3
-    #define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
-  #endif
   extern float delta[3];
   extern float endstop_adj[3]; // axis[n].endstop_adj
   extern float delta_radius;