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

Merge pull request #2492 from vintagepc/belt-test-fixes-no-reorg 

Belt test improvements (No display alteration)
This commit is contained in:
DRracer 2020-03-26 18:53:40 +01:00 committed by GitHub
parent faebb774ff 1aaefffdb0
commit 587b051b1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Firmware/ultralcd.cpp
View File

@ -7487,35 +7487,36 @@ void lcd_belttest_print(const char* msg, uint16_t X, uint16_t Y)
} }
void lcd_belttest() void lcd_belttest()
{ {
int _progress = 0;
bool _result = true; bool _result = true;
#ifdef TMC2130 // Belttest requires high power mode. Enable it.
FORCE_HIGH_POWER_START;
#endif
uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X));
uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y));
lcd_belttest_print(_i("Checking X..."), X, Y); lcd_belttest_print(_i("Checking X..."), X, Y);
_delay(2000);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
_result = lcd_selfcheck_axis_sg(X_AXIS); _result = lcd_selfcheck_axis_sg(X_AXIS);
X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X));
if (!_result){ if (_result){
lcd_belttest_print(_i("Error"), X, Y); lcd_belttest_print(_i("Checking Y..."), X, Y);
return; _result = lcd_selfcheck_axis_sg(Y_AXIS);
Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y));
} }
lcd_belttest_print(_i("Checking Y..."), X, Y); if (!_result) {
_result = lcd_selfcheck_axis_sg(Y_AXIS);
Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y));
if (!_result){
lcd_belttest_print(_i("Error"), X, Y); lcd_belttest_print(_i("Error"), X, Y);
lcd_clear(); } else {
return; lcd_belttest_print(_i("Done"), X, Y);
} }
lcd_belttest_print(_i("Done"), X, Y);
#ifdef TMC2130
FORCE_HIGH_POWER_END;
#endif
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
_delay(3000); _delay(3000);
} }
@ -7873,9 +7874,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) {
enable_endstops(true); enable_endstops(true);
if (axis == X_AXIS) { //there is collision between cables and PSU cover in X axis if Z coordinate is too low if (axis == X_AXIS) { //there is collision between cables and PSU cover in X axis if Z coordinate is too low
raise_z_above(17,true);
current_position[Z_AXIS] += 17;
plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder);
tmc2130_home_enter(Z_AXIS_MASK); tmc2130_home_enter(Z_AXIS_MASK);
st_synchronize(); st_synchronize();
tmc2130_home_exit(); tmc2130_home_exit();