Browse Source

Fix up probe pin define and test

Scott Lahteine 8 years ago
parent
commit
89fb778684
3 changed files with 2 additions and 7 deletions
  1. 2
    5
      Marlin/SanityCheck.h
  2. 0
    1
      Marlin/pins_RAMPS_13.h
  3. 0
    1
      Marlin/pins_RUMBA.h

+ 2
- 5
Marlin/SanityCheck.h View File

135
     #if !PIN_EXISTS(Z_MIN)
135
     #if !PIN_EXISTS(Z_MIN)
136
       #if !PIN_EXISTS(Z_MIN_PROBE) || (DISABLED(Z_MIN_PROBE_ENDSTOP) || ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)) // It's possible for someone to set a pin for the Z probe, but not enable it.
136
       #if !PIN_EXISTS(Z_MIN_PROBE) || (DISABLED(Z_MIN_PROBE_ENDSTOP) || ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)) // It's possible for someone to set a pin for the Z probe, but not enable it.
137
         #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
137
         #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
138
-          #error You must have a Z min or Z probe endstop to enable Z_MIN_PROBE_REPEATABILITY_TEST.
138
+          #error You must have a Z_MIN or Z_PROBE endstop to enable Z_MIN_PROBE_REPEATABILITY_TEST.
139
         #else
139
         #else
140
           #error AUTO_BED_LEVELING_FEATURE requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_MIN_PROBE_PIN must point to a valid hardware pin.
140
           #error AUTO_BED_LEVELING_FEATURE requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_MIN_PROBE_PIN must point to a valid hardware pin.
141
         #endif
141
         #endif
146
      * Require a Z probe pin if Z_MIN_PROBE_ENDSTOP is enabled.
146
      * Require a Z probe pin if Z_MIN_PROBE_ENDSTOP is enabled.
147
      */
147
      */
148
     #if ENABLED(Z_MIN_PROBE_ENDSTOP)
148
     #if ENABLED(Z_MIN_PROBE_ENDSTOP)
149
-      #ifndef Z_MIN_PROBE_PIN
150
-        #error You must have a Z_MIN_PROBE_PIN defined in your pins_XXXX.h file if you enable Z_MIN_PROBE_ENDSTOP.
151
-      #endif
152
       #if !PIN_EXISTS(Z_MIN_PROBE)
149
       #if !PIN_EXISTS(Z_MIN_PROBE)
153
-        #error You must set Z_MIN_PROBE_PIN to a valid pin if you enable Z_MIN_PROBE_ENDSTOP.
150
+        #error You must have a Z_MIN_PROBE_PIN defined in your pins_XXXX.h file if you enable Z_MIN_PROBE_ENDSTOP.
154
       #endif
151
       #endif
155
 // Forcing Servo definitions can break some hall effect sensor setups. Leaving these here for further comment.
152
 // Forcing Servo definitions can break some hall effect sensor setups. Leaving these here for further comment.
156
 //      #ifndef NUM_SERVOS
153
 //      #ifndef NUM_SERVOS

+ 0
- 1
Marlin/pins_RAMPS_13.h View File

40
 #define Z_ENABLE_PIN       62
40
 #define Z_ENABLE_PIN       62
41
 #define Z_MIN_PIN          18
41
 #define Z_MIN_PIN          18
42
 #define Z_MAX_PIN          19
42
 #define Z_MAX_PIN          19
43
-#define Z_MIN_PROBE_PIN    -1
44
 
43
 
45
 #define E0_STEP_PIN        26
44
 #define E0_STEP_PIN        26
46
 #define E0_DIR_PIN         28
45
 #define E0_DIR_PIN         28

+ 0
- 1
Marlin/pins_RUMBA.h View File

27
 #define Z_ENABLE_PIN       62
27
 #define Z_ENABLE_PIN       62
28
 #define Z_MIN_PIN          33
28
 #define Z_MIN_PIN          33
29
 #define Z_MAX_PIN          32
29
 #define Z_MAX_PIN          32
30
-#define Z_MIN_PROBE_PIN    -1
31
 
30
 
32
 #if ENABLED(Z_MIN_PROBE_ENDSTOP)
31
 #if ENABLED(Z_MIN_PROBE_ENDSTOP)
33
   // Define a pin to use as the signal pin on Arduino for the Z probe endstop.
32
   // Define a pin to use as the signal pin on Arduino for the Z probe endstop.

Loading…
Cancel
Save