3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #290 from PavelSindler/xyz_cal_fix

Browse source 
xyz cal.: reset watchdog during LS optimization method
This commit is contained in:
PavelSindler 2017-12-05 13:50:47 +01:00 committed by GitHub
commit f717f52afa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Firmware/mesh_bed_calibration.cpp
View file

@ -234,6 +234,7 @@ BedSkewOffsetDetectionResultType calculate_machine_skew_and_offset_LS(
float A[4][4] = { 0.f }; float A[4][4] = { 0.f };
float b[4] = { 0.f }; float b[4] = { 0.f };
float acc; float acc;
delay_keep_alive(0); //manage heater, reset watchdog, manage inactivity
for (uint8_t r = 0; r < 4; ++r) { for (uint8_t r = 0; r < 4; ++r) {
for (uint8_t c = 0; c < 4; ++c) { for (uint8_t c = 0; c < 4; ++c) {
acc = 0; acc = 0;
@ -1926,7 +1927,8 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level
} }
#endif // SUPPORT_VERBOSITY #endif // SUPPORT_VERBOSITY
} }
delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity
#ifdef SUPPORT_VERBOSITY #ifdef SUPPORT_VERBOSITY
if (verbosity_level >= 20) { if (verbosity_level >= 20) {
// Test the positions. Are the positions reproducible? Now the calibration is active in the planner. // Test the positions. Are the positions reproducible? Now the calibration is active in the planner.
@ -1951,8 +1953,9 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level
SERIAL_ECHOPGM(" < "); SERIAL_ECHOPGM(" < ");
MYSERIAL.println(Y_MIN_POS_CALIBRATION_POINT_OUT_OF_REACH); MYSERIAL.println(Y_MIN_POS_CALIBRATION_POINT_OUT_OF_REACH);
} }
result = calculate_machine_skew_and_offset_LS(pts, 4, bed_ref_points_4, vec_x, vec_y, cntr, verbosity_level); result = calculate_machine_skew_and_offset_LS(pts, 4, bed_ref_points_4, vec_x, vec_y, cntr, verbosity_level);
delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity
if (result >= 0) { if (result >= 0) {
world2machine_update(vec_x, vec_y, cntr); world2machine_update(vec_x, vec_y, cntr);
#if 1 #if 1
@ -2254,7 +2257,7 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8
#endif #endif
// Correct the current_position to match the transformed coordinate system after world2machine_rotation_and_skew and world2machine_shift were set. // Correct the current_position to match the transformed coordinate system after world2machine_rotation_and_skew and world2machine_shift were set.
world2machine_update_current(); world2machine_update_current();
enable_endstops(false); enable_endstops(false);
enable_z_endstop(false); enable_z_endstop(false);