Merge branch 'Merge_cleanup' into Development
This commit is contained in:
commit
9e603920c2
3 changed files with 3 additions and 3 deletions
|
@ -2811,7 +2811,7 @@ inline void gcode_M42() {
|
|||
#error "You must have a Z_PROBE_PIN defined in order to enable calculation of Z-Probe repeatability."
|
||||
#endif
|
||||
#else
|
||||
#if (Z_MIN_PIN == -1) &&
|
||||
#if (Z_MIN_PIN == -1)
|
||||
#error "You must have a Z_MIN_PIN defined in order to enable calculation of Z-Probe repeatability."
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -93,7 +93,7 @@
|
|||
* Require a Z Min pin
|
||||
*/
|
||||
#if Z_MIN_PIN == -1
|
||||
#if Z_PROBE_PIN == -1
|
||||
#if Z_PROBE_PIN == -1 || (! defined (Z_PROBE_ENDSTOP) || defined (DISABLE_Z_PROBE_ENDSTOP)) // It's possible for someone to set a pin for the Z Probe, but not enable it.
|
||||
#ifdef Z_PROBE_REPEATABILITY_TEST
|
||||
#error You must have a Z_MIN or Z_PROBE endstop to enable Z_PROBE_REPEATABILITY_TEST.
|
||||
#else
|
||||
|
|
Reference in a new issue