Prechádzať zdrojové kódy

Correctly translate thermal model LCD messages

Yuri D'Elia 2 rokov pred
rodič
commit
9b5ef75b68
2 zmenil súbory, kde vykonal 3 pridanie a 2 odobranie
  1. 2 0
      Firmware/Marlin_main.cpp
  2. 1 2
      Firmware/temperature.cpp

+ 2 - 0
Firmware/Marlin_main.cpp

@@ -9703,6 +9703,8 @@ void ThermalStop(bool allow_pause)
         Stopped = true;
         if(allow_pause && (IS_SD_PRINTING || usb_timer.running())) {
             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
                 // 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

+ 1 - 2
Firmware/temperature.cpp

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