SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10250 from thinkyhead/bf2_homing_move_adjustments

Browse source 
[2.0.x] Improvements to general and delta homing
This commit is contained in:
Scott Lahteine 2018-03-28 22:59:09 -05:00 committed by GitHub
commit 568ae094f4
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Marlin/src/module/delta.cpp
View file

@ -260,15 +260,17 @@ bool home_delta() {
line_to_current_position(); line_to_current_position();
stepper.synchronize(); stepper.synchronize();
// Re-enable stealthChop if used. Disable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING)
delta_sensorless_homing(false);
#endif
// If an endstop was not hit, then damage can occur if homing is continued. // If an endstop was not hit, then damage can occur if homing is continued.
// This can occur if the delta height not set correctly. // This can occur if the delta height not set correctly.
if (!(Endstops::endstop_hit_bits & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX)))) { if (!(Endstops::endstop_hit_bits & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX)))) {
LCD_MESSAGEPGM(MSG_ERR_HOMING_FAILED); LCD_MESSAGEPGM(MSG_ERR_HOMING_FAILED);
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_ERR_HOMING_FAILED); SERIAL_ERRORLNPGM(MSG_ERR_HOMING_FAILED);
#if ENABLED(SENSORLESS_HOMING)
delta_sensorless_homing(false);
#endif
return false; return false;
} }
@ -280,11 +282,6 @@ bool home_delta() {
HOMEAXIS(B); HOMEAXIS(B);
HOMEAXIS(C); HOMEAXIS(C);
// Re-enable stealthChop if used. Disable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING)
delta_sensorless_homing(false);
#endif
// Set all carriages to their home positions // Set all carriages to their home positions
// Do this here all at once for Delta, because // Do this here all at once for Delta, because
// XYZ isn't ABC. Applying this per-tower would // XYZ isn't ABC. Applying this per-tower would

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

@ -998,8 +998,17 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
} }
#endif #endif
// Only do some things when moving towards an endstop
const int8_t axis_home_dir =
#if ENABLED(DUAL_X_CARRIAGE)
(axis == X_AXIS) ? x_home_dir(active_extruder) :
#endif
home_dir(axis);
const bool is_home_dir = (axis_home_dir > 0) == (distance > 0);
if (is_home_dir) {
#if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH) #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
const bool deploy_bltouch = (axis == Z_AXIS && distance < 0); const bool deploy_bltouch = (axis == Z_AXIS && is_home_dir);
if (deploy_bltouch) set_bltouch_deployed(true); if (deploy_bltouch) set_bltouch_deployed(true);
#endif #endif
@ -1011,6 +1020,7 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)
sensorless_homing_per_axis(axis); sensorless_homing_per_axis(axis);
#endif #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,6 +1038,7 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
stepper.synchronize(); stepper.synchronize();
if (is_home_dir) {
#if QUIET_PROBING #if QUIET_PROBING
if (axis == Z_AXIS) probing_pause(false); if (axis == Z_AXIS) probing_pause(false);
#endif #endif
@ -1042,6 +1053,7 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa
#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)) {