CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sanity Check for probe raises

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-05 20:09:30 -07:00
parent d0b29cabf3
commit d7e9647505
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/Conditionals.h
View File

@ -783,14 +783,11 @@
#define XY_PROBE_SPEED 4000 #define XY_PROBE_SPEED 4000
#endif #endif
#endif #endif
#ifndef Z_RAISE_PROBE_DEPLOY_STOW #if Z_RAISE_BETWEEN_PROBINGS > Z_RAISE_PROBE_DEPLOY_STOW
#if defined(Z_RAISE_BEFORE_PROBING) && defined(Z_RAISE_AFTER_PROBING) #define _Z_RAISE_PROBE_DEPLOY_STOW Z_RAISE_BETWEEN_PROBINGS
#define Z_RAISE_PROBE_DEPLOY_STOW (max(Z_RAISE_BEFORE_PROBING, Z_RAISE_AFTER_PROBING)) #else
#else #define _Z_RAISE_PROBE_DEPLOY_STOW Z_RAISE_PROBE_DEPLOY_STOW
#error "You must set Z_RAISE_PROBE_DEPLOY_STOW in your configuration."
#endif
#endif #endif
#define _Z_RAISE_PROBE_DEPLOY_STOW (max(Z_RAISE_PROBE_DEPLOY_STOW, Z_RAISE_BETWEEN_PROBINGS))
#endif #endif
/** /**

15
Marlin/SanityCheck.h
View File

@ -293,6 +293,21 @@
//#endif //#endif
#endif #endif
/**
* Make sure Z raise values are set
*/
#if defined(Z_RAISE_BEFORE_PROBING) || defined(Z_RAISE_AFTER_PROBING)
#error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_RAISE_PROBE_DEPLOY_STOW instead."
#elif !defined(Z_RAISE_PROBE_DEPLOY_STOW)
#error "You must set Z_RAISE_PROBE_DEPLOY_STOW in your configuration."
#elif !defined(Z_RAISE_BETWEEN_PROBINGS)
#error "You must set Z_RAISE_BETWEEN_PROBINGS in your configuration."
#elif Z_RAISE_PROBE_DEPLOY_STOW < 1
#error "Probes need Z_RAISE_PROBE_DEPLOY_STOW >= 1."
#elif Z_RAISE_BETWEEN_PROBINGS < 1
#error "Probes need Z_RAISE_BETWEEN_PROBINGS >= 1."
#endif
#else #else
/** /**