Browse Source

Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE

esenapaj 8 years ago
parent
commit
e2b87f6c85
3 changed files with 5 additions and 11 deletions
  1. 1
    8
      Marlin/Conditionals.h
  2. 1
    1
      Marlin/Marlin_main.cpp
  3. 3
    2
      Marlin/SanityCheck.h

+ 1
- 8
Marlin/Conditionals.h View File

@@ -388,13 +388,6 @@
388 388
   #endif
389 389
 
390 390
   /**
391
-   * Enable MECHANICAL_PROBE for Z_PROBE_ALLEN_KEY, for older configs
392
-   */
393
-  #if ENABLED(Z_PROBE_ALLEN_KEY)
394
-    #define MECHANICAL_PROBE
395
-  #endif
396
-
397
-  /**
398 391
    * Host keep alive
399 392
    */
400 393
   #ifndef DEFAULT_KEEPALIVE_INTERVAL
@@ -742,7 +735,7 @@
742 735
     #endif
743 736
   #endif
744 737
 
745
-  #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))
738
+  #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))
746 739
 
747 740
   #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))
748 741
 

+ 1
- 1
Marlin/Marlin_main.cpp View File

@@ -3238,7 +3238,7 @@ inline void gcode_G28() {
3238 3238
 
3239 3239
     #if ENABLED(Z_PROBE_SLED)
3240 3240
       dock_sled(false); // engage (un-dock) the Z probe
3241
-    #elif ENABLED(MECHANICAL_PROBE) || ENABLED(FIX_MOUNTED_PROBE) || (ENABLED(DELTA) && SERVO_LEVELING)
3241
+    #elif ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || (ENABLED(DELTA) && SERVO_LEVELING)
3242 3242
       deploy_z_probe();
3243 3243
     #endif
3244 3244
 

+ 3
- 2
Marlin/SanityCheck.h View File

@@ -237,8 +237,9 @@
237 237
   /**
238 238
    * Only allow one probe option to be defined
239 239
    */
240
-  #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
241
-       || (ENABLED(MECHANICAL_PROBE) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
240
+  #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
241
+       || (ENABLED(MECHANICAL_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
242
+       || (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
242 243
        || (HAS_Z_ENDSTOP_SERVO && ENABLED(Z_PROBE_SLED))
243 244
     #error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
244 245
   #endif

Loading…
Cancel
Save