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

Small fixes

This commit is contained in:
leptun 2019-10-12 13:19:17 +03:00
parent 350e27810a
commit 4703853a3d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -2258,6 +2258,8 @@ bool homeaxis(int axis, bool doError, uint8_t cnt)
if (READ(Z_TMC2130_DIAG) != 0) { //Z crash if (READ(Z_TMC2130_DIAG) != 0) { //Z crash
FORCE_HIGH_POWER_END; FORCE_HIGH_POWER_END;
if (doError) kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); if (doError) kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW));
current_position[axis] = -5; //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]);
return 0; return 0;
} }
#endif //TMC2130 #endif //TMC2130
@ -2274,6 +2276,8 @@ bool homeaxis(int axis, bool doError, uint8_t cnt)
if (READ(Z_TMC2130_DIAG) != 0) { //Z crash if (READ(Z_TMC2130_DIAG) != 0) { //Z crash
FORCE_HIGH_POWER_END; FORCE_HIGH_POWER_END;
if (doError) kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); if (doError) kill(_T(MSG_BED_LEVELING_FAILED_POINT_LOW));
current_position[axis] = -5; //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]);
return 0; return 0;
} }
#endif //TMC2130 #endif //TMC2130

7
Firmware/ultralcd.cpp
View File

@ -7483,7 +7483,11 @@ bool lcd_selftest()
st_synchronize(); st_synchronize();
set_destination_to_current(); set_destination_to_current();
_progress = lcd_selftest_screen(TestScreen::AxisZ, _progress, 3, true, 1500); _progress = lcd_selftest_screen(TestScreen::AxisZ, _progress, 3, true, 1500);
#ifdef TMC2130
_result = homeaxis(Z_AXIS, 0); _result = homeaxis(Z_AXIS, 0);
#else
_result = lcd_selfcheck_axis(Z_AXIS, Z_MAX_POS);
#endif //TMC2130
//raise Z to not damage the bed during and hotend testing //raise Z to not damage the bed during and hotend testing
current_position[Z_AXIS] += 20; current_position[Z_AXIS] += 20;
@ -7700,7 +7704,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) {
} }
#endif //TMC2130 #endif //TMC2130
//#ifndef TMC2130 #ifndef TMC2130
static bool lcd_selfcheck_axis(int _axis, int _travel) static bool lcd_selfcheck_axis(int _axis, int _travel)
{ {
@ -7806,7 +7810,6 @@ static bool lcd_selfcheck_axis(int _axis, int _travel)
return _stepresult; return _stepresult;
} }
#ifndef TMC2130
static bool lcd_selfcheck_pulleys(int axis) static bool lcd_selfcheck_pulleys(int axis)
{ {
float tmp_motor_loud[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD; float tmp_motor_loud[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD;