Browse Source

Drop a conditional only used once

Scott Lahteine 7 years ago
parent
commit
3f89bbeab5

+ 1
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

733
 
733
 
734
     #endif // AUTO_BED_LEVELING_3POINT
734
     #endif // AUTO_BED_LEVELING_3POINT
735
 
735
 
736
-    // Raise to _Z_CLEARANCE_DEPLOY_PROBE. Stow the probe.
736
+    // Stow the probe, raising if not fix-mounted.
737
     if (STOW_PROBE()) {
737
     if (STOW_PROBE()) {
738
       set_bed_leveling_enabled(abl_should_enable);
738
       set_bed_leveling_enabled(abl_should_enable);
739
       measured_z = NAN;
739
       measured_z = NAN;

+ 0
- 5
Marlin/src/inc/Conditionals_post.h View File

916
       #define XY_PROBE_SPEED 4000
916
       #define XY_PROBE_SPEED 4000
917
     #endif
917
     #endif
918
   #endif
918
   #endif
919
-  #if Z_CLEARANCE_BETWEEN_PROBES > Z_CLEARANCE_DEPLOY_PROBE
920
-    #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_BETWEEN_PROBES
921
-  #else
922
-    #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_DEPLOY_PROBE
923
-  #endif
924
 #else
919
 #else
925
   #undef X_PROBE_OFFSET_FROM_EXTRUDER
920
   #undef X_PROBE_OFFSET_FROM_EXTRUDER
926
   #undef Y_PROBE_OFFSET_FROM_EXTRUDER
921
   #undef Y_PROBE_OFFSET_FROM_EXTRUDER

+ 8
- 8
Marlin/src/module/probe.cpp View File

374
 
374
 
375
   if (endstops.z_probe_enabled == deploy) return false;
375
   if (endstops.z_probe_enabled == deploy) return false;
376
 
376
 
377
-  // Fix-mounted probe should only raise for deploy
378
-  #if ENABLED(FIX_MOUNTED_PROBE)
379
-    #define RAISE_COND deploy
380
-  #else
381
-    #define RAISE_COND true
382
-  #endif
383
-
384
   // Make room for probe to deploy (or stow)
377
   // Make room for probe to deploy (or stow)
385
-  if (RAISE_COND) do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE);
378
+  // Fix-mounted probe should only raise for deploy
379
+  if (
380
+    #if ENABLED(FIX_MOUNTED_PROBE)
381
+      deploy
382
+    #else
383
+      true
384
+    #endif
385
+  ) do_probe_raise(max(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
386
 
386
 
387
   #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
387
   #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
388
     #if ENABLED(Z_PROBE_SLED)
388
     #if ENABLED(Z_PROBE_SLED)

Loading…
Cancel
Save