Merge branch 'Development' into manual-bed-leveling+mesh-bed-level

Fixed conflicts: Marlin/planner.h
2015-03-17 22:48:08 +01:00
parent e983a5ab92 f5f99c4883
commit 8067a985ce
20 changed files with 1958 additions and 83 deletions
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@ -1073,7 +1073,7 @@ Having the real displacement of the head, we can calculate the total movement le
  st_wake_up();
 }

-#ifdef ENABLE_AUTO_BED_LEVELING
+#if defined(ENABLE_AUTO_BED_LEVELING) && not defined(DELTA)
 vector_3 plan_get_position() {
 	vector_3 position = vector_3(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS), st_get_position_mm(Z_AXIS));