Browse Source

Spaces not tabs in language.h.

Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
Chris Roadfeldt 10 years ago
parent
commit
916f59e35f
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/SanityCheck.h
  2. 1
    1
      Marlin/language.h

+ 1
- 1
Marlin/SanityCheck.h View File

93
      * Require a Z Min pin
93
      * Require a Z Min pin
94
      */
94
      */
95
     #if Z_MIN_PIN == -1
95
     #if Z_MIN_PIN == -1
96
-      #if Z_PROBE_PIN == -1
96
+      #if Z_PROBE_PIN == -1 || (! defined (Z_PROBE_ENDSTOP) || defined (DISABLE_Z_PROBE_ENDSTOP)) // It's possible for someone to set a ping for the Z Probe, but not enable it.
97
         #ifdef Z_PROBE_REPEATABILITY_TEST
97
         #ifdef Z_PROBE_REPEATABILITY_TEST
98
           #error You must have a Z_MIN or Z_PROBE endstop to enable Z_PROBE_REPEATABILITY_TEST.
98
           #error You must have a Z_MIN or Z_PROBE endstop to enable Z_PROBE_REPEATABILITY_TEST.
99
         #else
99
         #else

+ 1
- 1
Marlin/language.h View File

138
 #define MSG_Z_MIN                           "z_min: "
138
 #define MSG_Z_MIN                           "z_min: "
139
 #define MSG_Z_MAX                           "z_max: "
139
 #define MSG_Z_MAX                           "z_max: "
140
 #define MSG_Z2_MAX                          "z2_max: "
140
 #define MSG_Z2_MAX                          "z2_max: "
141
-#define MSG_Z_PROBE							"z_probe: "
141
+#define MSG_Z_PROBE                         "z_probe: "
142
 #define MSG_M119_REPORT                     "Reporting endstop status"
142
 #define MSG_M119_REPORT                     "Reporting endstop status"
143
 #define MSG_ENDSTOP_HIT                     "TRIGGERED"
143
 #define MSG_ENDSTOP_HIT                     "TRIGGERED"
144
 #define MSG_ENDSTOP_OPEN                    "open"
144
 #define MSG_ENDSTOP_OPEN                    "open"

Loading…
Cancel
Save