Disable PROBE_MANUALLY for UBL

Plus some other UBL tweaks.
2017-05-19 06:50:01 -05:00
parent 94a4af1d7f
commit 75badae2f8
4 changed files with 28 additions and 11 deletions
--- a/Marlin/Conditionals_LCD.h
+++ b/Marlin/Conditionals_LCD.h
@ -373,6 +373,13 @@
   */
  #define HAS_Z_SERVO_ENDSTOP (defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)

+  /**
+   * UBL has its own manual probing, so this just causes trouble.
+   */
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    #undef PROBE_MANUALLY
+  #endif
+
  /**
   * Set a flag for any enabled probe
   */