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

Correctly translate thermal model LCD messages

Browse Source
This commit is contained in:
Yuri D'Elia 2022-08-29 23:33:53 +02:00 committed by DRracer
parent 331de988f7
commit 9b5ef75b68
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -9703,6 +9703,8 @@ void ThermalStop(bool allow_pause)
Stopped = true; Stopped = true;
if(allow_pause && (IS_SD_PRINTING || usb_timer.running())) { if(allow_pause && (IS_SD_PRINTING || usb_timer.running())) {
if (!isPrintPaused) { if (!isPrintPaused) {
lcd_setalertstatuspgm(_T(MSG_PAUSED_THERMAL_ERROR), LCD_STATUS_CRITICAL);
// we cannot make a distinction for the host here, the pause must be instantaneous // we cannot make a distinction for the host here, the pause must be instantaneous
// so we call the lcd_pause_print to save the print state internally. Thermal errors // so we call the lcd_pause_print to save the print state internally. Thermal errors
// disable heaters and save the original temperatures to saved_*, which will get // disable heaters and save the original temperatures to saved_*, which will get

3
Firmware/temperature.cpp
View File

@ -1759,7 +1759,6 @@ void handle_temp_error()
case TempErrorType::model: case TempErrorType::model:
if(temp_error_state.assert) { if(temp_error_state.assert) {
if(IsStopped() == false) { if(IsStopped() == false) {
lcd_setalertstatuspgm(MSG_PAUSED_THERMAL_ERROR, LCD_STATUS_CRITICAL);
SERIAL_ECHOLNPGM("TM: error triggered!"); SERIAL_ECHOLNPGM("TM: error triggered!");
} }
ThermalStop(true); ThermalStop(true);
@ -2435,7 +2434,7 @@ void handle_warning()
if(warning_state.assert) { if(warning_state.assert) {
if (first) { if (first) {
if(warn_beep) { if(warn_beep) {
lcd_setalertstatuspgm(MSG_THERMAL_ANOMALY, LCD_STATUS_INFO); lcd_setalertstatuspgm(_T(MSG_THERMAL_ANOMALY), LCD_STATUS_INFO);
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
} }
} else { } else {