Fix bed / nozzle test order and progress bar.

Known limitation:
Z progress shown in bed progress.
This commit is contained in:
Marek Bel 2019-01-24 20:03:37 +01:00
parent 22859800f0
commit 305598d7f6

View File

@ -6410,13 +6410,13 @@ bool lcd_selftest()
if (_result) if (_result)
{ {
_progress = lcd_selftest_screen(6, _progress, 3, true, 2000); //check bed _progress = lcd_selftest_screen(6, _progress, 3, true, 2000); //check bed
_result = lcd_selfcheck_check_heater(false); _result = lcd_selfcheck_check_heater(true);
} }
if (_result) if (_result)
{ {
_progress = lcd_selftest_screen(7, _progress, 3, true, 1000); //check nozzle _progress = lcd_selftest_screen(7, _progress, 3, true, 1000); //check nozzle
_result = lcd_selfcheck_check_heater(true); _result = lcd_selfcheck_check_heater(false);
} }
if (_result) if (_result)
{ {
@ -6821,7 +6821,7 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
_progress = (_isbed) ? lcd_selftest_screen(7, _progress, 2, false, 400) : lcd_selftest_screen(3, _progress, 2, false, 400); _progress = (_isbed) ? lcd_selftest_screen(6, _progress, 2, false, 400) : lcd_selftest_screen(7, _progress, 2, false, 400);
/*if (_isbed) { /*if (_isbed) {
MYSERIAL.print("Bed temp:"); MYSERIAL.print("Bed temp:");
MYSERIAL.println(degBed()); MYSERIAL.println(degBed());