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

Fix go up

This commit is contained in:
Alex Voinea 2020-04-01 13:50:22 +03:00
parent 8b2b32c85b
commit 792bab9bbb
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View File

@ -2316,14 +2316,16 @@ bool homeaxis(int axis, bool doError, uint8_t cnt)
FORCE_HIGH_POWER_END; FORCE_HIGH_POWER_END;
if (doError) if (doError)
{ {
current_position[Z_AXIS] = 0;
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
current_position[Z_AXIS] += MESH_HOME_Z_SEARCH; current_position[Z_AXIS] += MESH_HOME_Z_SEARCH;
plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder); plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder);
st_synchronize(); st_synchronize();
kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW));
} }
current_position[axis] = -MESH_HOME_Z_SEARCH; //assume that nozzle crashed into bed current_position[Z_AXIS] = -MESH_HOME_Z_SEARCH; //assume that nozzle crashed into bed
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
return 0; return 0;
} }
#endif //TMC2130 #endif //TMC2130
current_position[axis] = 0; current_position[axis] = 0;
@ -2340,14 +2342,16 @@ bool homeaxis(int axis, bool doError, uint8_t cnt)
FORCE_HIGH_POWER_END; FORCE_HIGH_POWER_END;
if (doError) if (doError)
{ {
current_position[Z_AXIS] = 0;
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
current_position[Z_AXIS] += MESH_HOME_Z_SEARCH; current_position[Z_AXIS] += MESH_HOME_Z_SEARCH;
plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder); plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder);
st_synchronize(); st_synchronize();
kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW));
} }
current_position[axis] = -MESH_HOME_Z_SEARCH; //assume that nozzle crashed into bed current_position[Z_AXIS] = -MESH_HOME_Z_SEARCH; //assume that nozzle crashed into bed
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
return 0; return 0;
} }
#endif //TMC2130 #endif //TMC2130
axis_is_at_home(axis); axis_is_at_home(axis);