Browse Source

Deploy & Stow in G29 for Delta + Z Servo Endstop

Scott Lahteine 8 years ago
parent
commit
82ef101ed5
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      Marlin/Conditionals.h
  2. 2
    2
      Marlin/Marlin_main.cpp

+ 1
- 1
Marlin/Conditionals.h View File

339
     #define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
339
     #define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
340
   #endif
340
   #endif
341
 
341
 
342
-  #define SERVO_LEVELING (defined(AUTO_BED_LEVELING_FEATURE) && defined(Z_ENDSTOP_SERVO_NR))
342
+  #define SERVO_LEVELING (ENABLED(AUTO_BED_LEVELING_FEATURE) && defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
343
 
343
 
344
   /**
344
   /**
345
    * Sled Options
345
    * Sled Options

+ 2
- 2
Marlin/Marlin_main.cpp View File

3074
 
3074
 
3075
     #if ENABLED(Z_PROBE_SLED)
3075
     #if ENABLED(Z_PROBE_SLED)
3076
       dock_sled(false); // engage (un-dock) the Z probe
3076
       dock_sled(false); // engage (un-dock) the Z probe
3077
-    #elif ENABLED(Z_PROBE_ALLEN_KEY) //|| SERVO_LEVELING
3077
+    #elif ENABLED(Z_PROBE_ALLEN_KEY) || (ENABLED(DELTA) && SERVO_LEVELING)
3078
       deploy_z_probe();
3078
       deploy_z_probe();
3079
     #endif
3079
     #endif
3080
 
3080
 
3342
 
3342
 
3343
     #if ENABLED(DELTA)
3343
     #if ENABLED(DELTA)
3344
       // Allen Key Probe for Delta
3344
       // Allen Key Probe for Delta
3345
-      #if ENABLED(Z_PROBE_ALLEN_KEY)
3345
+      #if ENABLED(Z_PROBE_ALLEN_KEY) || SERVO_LEVELING
3346
         stow_z_probe();
3346
         stow_z_probe();
3347
       #elif Z_RAISE_AFTER_PROBING > 0
3347
       #elif Z_RAISE_AFTER_PROBING > 0
3348
         raise_z_after_probing(); // ???
3348
         raise_z_after_probing(); // ???

Loading…
Cancel
Save