0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix BLTOUCH compile error

Browse source 
Followup to #10250
This commit is contained in:
Scott Lahteine 2018-03-29 16:57:06 -05:00
parent c1f58a238d
commit b852781eba
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Marlin/src/module/motion.cpp
View file

@ -1007,14 +1007,17 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
const bool is_home_dir = (axis_home_dir > 0) == (distance > 0); const bool is_home_dir = (axis_home_dir > 0) == (distance > 0);
if (is_home_dir) { if (is_home_dir) {
#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
const bool deploy_bltouch = (axis == Z_AXIS && is_home_dir);
if (deploy_bltouch) set_bltouch_deployed(true);
#endif
#if QUIET_PROBING if (axis == Z_AXIS) {
if (axis == Z_AXIS) probing_pause(true); #if HOMING_Z_WITH_PROBE
#if ENABLED(BLTOUCH)
set_bltouch_deployed(true);
#endif #endif
#if QUIET_PROBING
probing_pause(true);
#endif
#endif
}
// Disable stealthChop if used. Enable diag1 pin on driver. // Disable stealthChop if used. Enable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)
@ -1039,13 +1042,17 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
stepper.synchronize(); stepper.synchronize();
if (is_home_dir) { if (is_home_dir) {
#if QUIET_PROBING
if (axis == Z_AXIS) probing_pause(false);
#endif
#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH) if (axis == Z_AXIS) {
if (deploy_bltouch) set_bltouch_deployed(false); #if HOMING_Z_WITH_PROBE
#if QUIET_PROBING
probing_pause(false);
#endif #endif
#if ENABLED(BLTOUCH)
set_bltouch_deployed(false);
#endif
#endif
}
endstops.hit_on_purpose(); endstops.hit_on_purpose();