SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'Merge_cleanup' into Development

Browse source
This commit is contained in:
Chris Roadfeldt 2015-04-01 19:31:14 -05:00
commit 9e603920c2
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View file

@ -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." #error "You must have a Z_PROBE_PIN defined in order to enable calculation of Z-Probe repeatability."
#endif #endif
#else #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." #error "You must have a Z_MIN_PIN defined in order to enable calculation of Z-Probe repeatability."
#endif #endif
#endif #endif

2
Marlin/SanityCheck.h
View file

@ -93,7 +93,7 @@
* Require a Z Min pin * Require a Z Min pin
*/ */
#if Z_MIN_PIN == -1 #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 #ifdef Z_PROBE_REPEATABILITY_TEST
#error You must have a Z_MIN or Z_PROBE endstop to enable Z_PROBE_REPEATABILITY_TEST. #error You must have a Z_MIN or Z_PROBE endstop to enable Z_PROBE_REPEATABILITY_TEST.
#else #else

2
Marlin/language.h
View file

@ -138,7 +138,7 @@
#define MSG_Z_MIN "z_min: " #define MSG_Z_MIN "z_min: "
#define MSG_Z_MAX "z_max: " #define MSG_Z_MAX "z_max: "
#define MSG_Z2_MAX "z2_max: " #define MSG_Z2_MAX "z2_max: "
#define MSG_Z_PROBE "z_probe: " #define MSG_Z_PROBE "z_probe: "
#define MSG_M119_REPORT "Reporting endstop status" #define MSG_M119_REPORT "Reporting endstop status"
#define MSG_ENDSTOP_HIT "TRIGGERED" #define MSG_ENDSTOP_HIT "TRIGGERED"
#define MSG_ENDSTOP_OPEN "open" #define MSG_ENDSTOP_OPEN "open"