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

Merge pull request #404 from PavelSindler/xyz_fixes

Browse Source 
xyz homing hotfix, xyz cal. status changed
This commit is contained in:
XPila 2018-01-16 01:39:57 +01:00 committed by GitHub
commit 026f68fd6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View File

@ -2019,6 +2019,12 @@ bool gcode_M45(bool onlyZ)
lcd_display_message_fullscreen_P(MSG_AUTO_HOME); lcd_display_message_fullscreen_P(MSG_AUTO_HOME);
home_xy(); home_xy();
enable_endstops(false);
current_position[X_AXIS] += 5;
current_position[Y_AXIS] += 5;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder);
st_synchronize();
// Let the user move the Z axes up to the end stoppers. // Let the user move the Z axes up to the end stoppers.
#ifdef TMC2130 #ifdef TMC2130
if (calibrate_z_auto()) if (calibrate_z_auto())
@ -2092,7 +2098,7 @@ bool gcode_M45(bool onlyZ)
else else
{ {
// Reset the baby step value and the baby step applied flag. // Reset the baby step value and the baby step applied flag.
calibration_status_store(CALIBRATION_STATUS_ASSEMBLED); calibration_status_store(CALIBRATION_STATUS_XYZ_CALIBRATION);
eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z, 0); eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z, 0);
// Complete XYZ calibration. // Complete XYZ calibration.
uint8_t point_too_far_mask = 0; uint8_t point_too_far_mask = 0;