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

Fix home_delta for SENSORLESS_HOMING (#10145)

Browse source
This commit is contained in:
Scott Lahteine 2018-03-17 20:52:06 -05:00 committed by GitHub
parent 883524056b
commit 93af8aa157
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,6 +229,14 @@ void forward_kinematics_DELTA(float z1, float z2, float z3) {
cartes[Z_AXIS] = z1 + ex[2] * Xnew + ey[2] * Ynew - ez[2] * Znew;
}
#if ENABLED(SENSORLESS_HOMING)
inline void delta_sensorless_homing(const bool on=true) {
sensorless_homing_per_axis(A_AXIS, on);
sensorless_homing_per_axis(B_AXIS, on);
sensorless_homing_per_axis(C_AXIS, on);
}
#endif
/**
* A delta can only safely home all axes at the same time
* This is like quick_home_xy() but for 3 towers.
@ -243,9 +251,7 @@ bool home_delta() {
// Disable stealthChop if used. Enable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING)
sensorless_homing_per_axis(A_AXIS);
sensorless_homing_per_axis(B_AXIS);
sensorless_homing_per_axis(C_AXIS);
delta_sensorless_homing();
#endif
// Move all carriages together linearly until an endstop is hit.
@ -254,19 +260,15 @@ bool home_delta() {
line_to_current_position();
stepper.synchronize();
// Re-enable stealthChop if used. Disable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING)
sensorless_homing_per_axis(A_AXIS, false);
sensorless_homing_per_axis(B_AXIS, false);
sensorless_homing_per_axis(C_AXIS, false);
#endif
// If an endstop was not hit, then damage can occur if homing is continued.
// This can occur if the delta height not set correctly.
if (!(Endstops::endstop_hit_bits & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX)))) {
LCD_MESSAGEPGM(MSG_ERR_HOMING_FAILED);
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_ERR_HOMING_FAILED);
#if ENABLED(SENSORLESS_HOMING)
delta_sensorless_homing(false);
#endif
return false;
}
@ -278,6 +280,11 @@ bool home_delta() {
HOMEAXIS(B);
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
// Do this here all at once for Delta, because
// XYZ isn't ABC. Applying this per-tower would