Combine Z raise before/after options

2016-06-26 13:56:30 -07:00
parent ca184d3d72
commit 10da7ac86c
22 changed files with 58 additions and 110 deletions
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@ -796,6 +796,14 @@
        #define XY_PROBE_SPEED 4000
      #endif
    #endif
+    #ifndef Z_RAISE_PROBE_DEPLOY_STOW
+      #if defined(Z_RAISE_BEFORE_PROBING) && defined(Z_RAISE_AFTER_PROBING)
+        #define Z_RAISE_PROBE_DEPLOY_STOW (max(Z_RAISE_BEFORE_PROBING, Z_RAISE_AFTER_PROBING))
+      #else
+        #error "You must set Z_RAISE_PROBE_DEPLOY_STOW in your configuration."
+      #endif
+    #endif
+    #define _Z_RAISE_PROBE_DEPLOY_STOW (max(Z_RAISE_PROBE_DEPLOY_STOW, Z_RAISE_BETWEEN_PROBINGS))
  #endif

  /**