MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop a conditional only used once

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-24 16:12:51 -06:00
parent 2a1162b42c
commit 2e3d74f60f
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Conditionals_post.h
View File

@ -848,11 +848,6 @@
#define XY_PROBE_SPEED 4000 #define XY_PROBE_SPEED 4000
#endif #endif
#endif #endif
#if Z_CLEARANCE_BETWEEN_PROBES > Z_CLEARANCE_DEPLOY_PROBE
#define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_BETWEEN_PROBES
#else
#define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_DEPLOY_PROBE
#endif
#else #else
#undef X_PROBE_OFFSET_FROM_EXTRUDER #undef X_PROBE_OFFSET_FROM_EXTRUDER
#undef Y_PROBE_OFFSET_FROM_EXTRUDER #undef Y_PROBE_OFFSET_FROM_EXTRUDER

16
Marlin/Marlin_main.cpp
View File

@ -2107,15 +2107,15 @@ static void clean_up_after_endstop_or_probe_move() {
if (endstops.z_probe_enabled == deploy) return false; if (endstops.z_probe_enabled == deploy) return false;
// Fix-mounted probe should only raise for deploy
#if ENABLED(FIX_MOUNTED_PROBE)
#define RAISE_COND deploy
#else
#define RAISE_COND true
#endif
// Make room for probe to deploy (or stow) // Make room for probe to deploy (or stow)
if (RAISE_COND) do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE); // Fix-mounted probe should only raise for deploy
if (
#if ENABLED(FIX_MOUNTED_PROBE)
deploy
#else
true
#endif
) do_probe_raise(max(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY) #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)