Merge pull request #4093 from thinkyhead/rc_probe_without_abl

Make Z Probe options independent of ABL
This commit is contained in:
Scott Lahteine
2016-06-19 19:44:25 -07:00
committed by GitHub
24 changed files with 1465 additions and 1240 deletions

View File

@ -431,10 +431,14 @@
#endif
/**
* Allen Key Z probe requires Auto Bed Leveling grid and Delta
* Allen Key Z probe requires Delta and Auto Bed Leveling grid
*/
#if ENABLED(Z_PROBE_ALLEN_KEY) && !(ENABLED(AUTO_BED_LEVELING_GRID) && ENABLED(DELTA))
#error "Invalid use of Z_PROBE_ALLEN_KEY."
#if ENABLED(Z_PROBE_ALLEN_KEY)
#if !ENABLED(DELTA)
#error "Z_PROBE_ALLEN_KEY is only usable with DELTA."
#elif ENABLED(MESH_BED_LEVELING) || (ENABLED(AUTO_BED_LEVELING_FEATURE) && !ENABLED(AUTO_BED_LEVELING_GRID))
#error "Z_PROBE_ALLEN_KEY can only use AUTO_BED_LEVELING_GRID leveling."
#endif
#endif
/**