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

Do moves towards endstops differently in do_homing_move

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-28 21:26:43 -05:00
parent d573a2cada
commit dbe2b6f7b0
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Marlin/src/module/motion.cpp
View File

@ -998,19 +998,29 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
} }
#endif #endif
#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH) // Only do some things when moving towards an endstop
const bool deploy_bltouch = (axis == Z_AXIS && distance < 0); const int8_t axis_home_dir =
if (deploy_bltouch) set_bltouch_deployed(true); #if ENABLED(DUAL_X_CARRIAGE)
#endif (axis == X_AXIS) ? x_home_dir(active_extruder) :
#endif
home_dir(axis);
const bool is_home_dir = (axis_home_dir > 0) == (distance > 0);
#if QUIET_PROBING if (is_home_dir) {
if (axis == Z_AXIS) probing_pause(true); #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
#endif const bool deploy_bltouch = (axis == Z_AXIS && is_home_dir);
if (deploy_bltouch) set_bltouch_deployed(true);
#endif
// Disable stealthChop if used. Enable diag1 pin on driver. #if QUIET_PROBING
#if ENABLED(SENSORLESS_HOMING) if (axis == Z_AXIS) probing_pause(true);
sensorless_homing_per_axis(axis); #endif
#endif
// Disable stealthChop if used. Enable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING)
sensorless_homing_per_axis(axis);
#endif
}
// Tell the planner the axis is at 0 // Tell the planner the axis is at 0
current_position[axis] = 0; current_position[axis] = 0;
@ -1028,20 +1038,22 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
stepper.synchronize(); stepper.synchronize();
#if QUIET_PROBING if (is_home_dir) {
if (axis == Z_AXIS) probing_pause(false); #if QUIET_PROBING
#endif if (axis == Z_AXIS) probing_pause(false);
#endif
#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH) #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
if (deploy_bltouch) set_bltouch_deployed(false); if (deploy_bltouch) set_bltouch_deployed(false);
#endif #endif
endstops.hit_on_purpose(); endstops.hit_on_purpose();
// Re-enable stealthChop if used. Disable diag1 pin on driver. // Re-enable stealthChop if used. Disable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)
sensorless_homing_per_axis(axis, false); sensorless_homing_per_axis(axis, false);
#endif #endif
}
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {