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

wizard: Disable temperature model during hotend testing 

This avoids confusing error messages if the hotend is defective and
caught by selftest itself.

Rearrange Stopped state checks (saves 2 bytes)
This commit is contained in:
Yuri D'Elia 2022-12-29 15:25:00 +01:00 committed by DRracer
parent d8ae372309
commit a8057e0d36
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Firmware/ultralcd.cpp
View File

@ -7025,6 +7025,10 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
target_temperature[0] = (_isbed) ? 0 : 200;
target_temperature_bed = (_isbed) ? 100 : 0;
#ifdef TEMP_MODEL
bool tm_was_enabled = temp_model_enabled();
temp_model_set_enabled(false);
#endif //TEMP_MODEL
manage_heater();
manage_inactivity(true);
@ -7061,16 +7065,9 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
*/
bool _stepresult = false;
if (Stopped)
if (Stopped || _opposite_result < ((_isbed) ? 30 : 9))
{
// thermal error occurred while heating the nozzle
lcd_selftest_error(TestError::Heater, "", "");
}
else
{
if (_opposite_result < ((_isbed) ? 30 : 9))
{
if (_checked_result >= ((_isbed) ? 9 : 30))
if (!Stopped && _checked_result >= ((_isbed) ? 9 : 30))
_stepresult = true;
else
lcd_selftest_error(TestError::Heater, "", "");
@ -7079,8 +7076,10 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
{
lcd_selftest_error(TestError::Bed, "", "");
}
}
#ifdef TEMP_MODEL
temp_model_set_enabled(tm_was_enabled);
#endif //TEMP_MODEL
manage_heater();
manage_inactivity(true);
return _stepresult;