bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Do a hard kill for failed homing moves (#11161)

Browse Source
This commit is contained in:
Scott Lahteine
2018-06-30 21:54:07 -05:00
committed by GitHub
parent 90ba77ea0f
commit c51e27d11d
8 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/calibrate/G28.cpp
View File

@ -72,7 +72,9 @@
#endif
do_blocking_move_to_xy(1.5 * mlx * x_axis_home_dir, 1.5 * mly * home_dir(Y_AXIS), fr_mm_s);
endstops.hit_on_purpose(); // clear endstop hit flags
endstops.validate_homing_move();
current_position[X_AXIS] = current_position[Y_AXIS] = 0.0;
#if ENABLED(SENSORLESS_HOMING)

11
Marlin/src/gcode/calibrate/G33.cpp
View File

@ -72,12 +72,10 @@ enum CalEnum : char { // the 7 main calibration points -
float lcd_probe_pt(const float &rx, const float &ry);
bool ac_home() {
void ac_home() {
endstops.enable(true);
if (!home_delta())
return false;
home_delta();
endstops.not_homing();
return true;
}
void ac_setup(const bool reset_bed) {
@ -530,8 +528,7 @@ void GcodeSuite::G33() {
ac_setup(!_0p_calibration && !_1p_calibration);
if (!_0p_calibration)
if (!ac_home()) return;
if (!_0p_calibration) ac_home();
do { // start iterations
@ -724,7 +721,7 @@ void GcodeSuite::G33() {
sprintf_P(&mess[15], PSTR("%03i.x"), (int)round(zero_std_dev));
lcd_setstatus(mess);
}
if (!ac_home()) return;
ac_home();
}
while (((zero_std_dev < test_precision && iterations < 31) || iterations <= force_iterations) && zero_std_dev > calibration_precision);