Various fixes: missed code uses, other updates

Marlin/src/inc/Conditionals-2-LCD.h

@@ -605,7 +605,6 @@
    *    (calling advance_status_scroll, status_and_len for a scrolling status message)
    */
   #define HAS_DISPLAY 1
-  #define HAS_UI_UPDATE 1
   #define HAS_STATUS_MESSAGE 1
 #endif
 

Marlin/src/lcd/e3v2/creality/dwin.cpp

@@ -1059,26 +1059,26 @@ void drawMotionMenu() {
     clearPopupArea();
     drawPopupBkgd105();
     if (toohigh) {
-      dwinIconShow(ICON, ICON_TempTooHigh, 102, 165);
+      dwinIconShow(ICON, ICON_TempTooHigh, 100, 165);
       if (hmiIsChinese()) {
         dwinFrameAreaCopy(1, 103, 371, 237, 386,  52, 285); // Temp Too High
         dwinFrameAreaCopy(1, 151, 389, 185, 402, 187, 285);
         dwinFrameAreaCopy(1, 189, 389, 271, 402,  95, 310);
       }
       else {
-        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, 36, 300, F("Nozzle or Bed temperature"));
-        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, 92, 300, F("is too high"));
+        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 13) / 2, 300, F("Nozzle or Bed"));
+        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 20) / 2, 300, GET_TEXT_F(MSG_TEMP_TOO_HIGH));
       }
     }
     else {
-      dwinIconShow(ICON, ICON_TempTooLow, 102, 165);
+      dwinIconShow(ICON, ICON_TempTooLow, 100, 165);
       if (hmiIsChinese()) {
         dwinFrameAreaCopy(1, 103, 371, 270, 386, 52, 285); // Tenp Too Low
         dwinFrameAreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
       else {
-        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, 36, 300, F("Nozzle or Bed temperature"));
-        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, 92, 300, F("is too low"));
+        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 13) / 2, 300, F("Nozzle or Bed"));
+        dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 19) / 2, 300, GET_TEXT_F(MSG_TEMP_TOO_LOW));
       }
     }
   }
@@ -1090,14 +1090,14 @@ void drawMotionMenu() {
   void popupWindowETempTooLow() {
     clearMainWindow();
     drawPopupBkgd60();
-    dwinIconShow(ICON, ICON_TempTooLow, 102, 105);
+    dwinIconShow(ICON, ICON_TempTooLow, 100, 105);
     if (hmiIsChinese()) {
       dwinFrameAreaCopy(1, 103, 371, 136, 386, 69, 240);      // Nozzle Too Cold
       dwinFrameAreaCopy(1, 170, 371, 270, 386, 69 + 33, 240);
       dwinIconShow(ICON, ICON_Confirm_C, 86, 280);
     }
     else {
-      dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, 20, 235, F("Nozzle is too cold"));
+      dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 18) / 2, 235, F("Nozzle is too cold"));
       dwinIconShow(ICON, ICON_Confirm_E, 86, 280);
     }
   }
@@ -1114,9 +1114,9 @@ void popupWindowResume() {
     dwinIconShow(ICON, ICON_Continue_C, 146, 307);
   }
   else {
-    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 14) / 2, 115, F("Continue Print"));
-    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 22) / 2, 192, F("It looks like the last"));
-    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 21) / 2, 212, F("file was interrupted."));
+    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 14) / 2, 115, GET_TEXT_F(MSG_OUTAGE_RECOVERY));
+    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 22) / 2, 192, GET_TEXT_F(MSG_OUTAGE_RECOVERY2));
+    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 21) / 2, 212, GET_TEXT_F(MSG_OUTAGE_RECOVERY3));
     dwinIconShow(ICON, ICON_Cancel_E,    26, 307);
     dwinIconShow(ICON, ICON_Continue_E, 146, 307);
   }
@@ -1125,15 +1125,15 @@ void popupWindowResume() {
 void popupWindowHome(const bool parking/*=false*/) {
   clearMainWindow();
   drawPopupBkgd60();
-  dwinIconShow(ICON, ICON_Printer_0, 101, 105);
+  dwinIconShow(ICON, ICON_Printer_0, 81, 90);
   if (hmiIsChinese()) {
     dwinFrameAreaCopy(1, 0, 371, 33, 386, 85, 240);       // Wait for Move to Complete
     dwinFrameAreaCopy(1, 203, 286, 271, 302, 118, 240);
     dwinFrameAreaCopy(1, 0, 389, 150, 402, 61, 280);
   }
   else {
-    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * (parking ? 7 : 10)) / 2, 230, parking ? F("Parking") : F("Homing XYZ"));
-    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 23) / 2, 260, F("Please wait until done."));
+    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * (parking ? 7 : 10)) / 2, 230, parking ? GET_TEXT_F(MSG_PAUSE_PRINT_PARKING) : GET_TEXT_F(MSG_LEVEL_BED_HOMING));
+    dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 23) / 2, 260, GET_TEXT_F(MSG_PLEASE_WAIT));
   }
 }
 
@@ -1142,14 +1142,14 @@ void popupWindowHome(const bool parking/*=false*/) {
   void popupWindowLeveling() {
     clearMainWindow();
     drawPopupBkgd60();
-    dwinIconShow(ICON, ICON_AutoLeveling, 101, 105);
+    dwinIconShow(ICON, ICON_AutoLeveling, 100, 107);
     if (hmiIsChinese()) {
       dwinFrameAreaCopy(1, 0, 371, 100, 386, 84, 240);    // Wait for Leveling
       dwinFrameAreaCopy(1, 0, 389, 150, 402, 61, 280);
     }
     else {
-      dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 12) / 2, 230, GET_TEXT_F(MSG_BED_LEVELING));
-      dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 23) / 2, 260, F("Please wait until done."));
+      dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 12) / 2, 230, GET_TEXT_F(MSG_BED_LEVELING));
+      dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 23) / 2, 260, GET_TEXT_F(MSG_PLEASE_WAIT));
     }
   }
 
@@ -1176,8 +1176,8 @@ void popupwindowPauseOrStop() {
     dwinIconShow(ICON, ICON_Cancel_C, 146, 280);
   }
   else {
-         if (select_print.now == PRINT_PAUSE_RESUME) dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
-    else if (select_print.now == PRINT_STOP) dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
+         if (select_print.now == PRINT_PAUSE_RESUME) dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
+    else if (select_print.now == PRINT_STOP) dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
     dwinIconShow(ICON, ICON_Confirm_E, 26, 280);
     dwinIconShow(ICON, ICON_Cancel_E, 146, 280);
   }
@@ -1499,7 +1499,7 @@ void hmiMoveDone(const AxisEnum axis) {
 
 #endif // HAS_HEATED_BED
 
-#if HAS_PREHEAT && HAS_FAN
+#if ALL(HAS_PREHEAT, HAS_FAN)
 
   void hmiFanSpeed() {
     EncoderState encoder_diffState = encoderReceiveAnalyze();
@@ -1850,9 +1850,11 @@ void MarlinUI::update() {
 void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const) {
   clearMainWindow();
   drawPopupBkgd60();
-  dwinIconShow(ICON, ICON_Printer_0, 101, 105);
-  dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 15) / 2, 230, GET_TEXT_F(MSG_PRINTER_KILLED));
-  dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (272 - 8 * 20) / 2, 260, GET_TEXT_F(MSG_TURN_OFF));
+  dwinIconShow(ICON, ICON_Printer_0, 81, 90);
+  uint8_t slen = utf8_strlen(lcd_error);
+  dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 15) / 2, 210, GET_TEXT_F(MSG_PRINTER_KILLED));
+  dwinDrawString(true, font8x16, COLOR_POPUP_TEXT, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * slen) / 2, 240, lcd_error);
+  dwinDrawString(true, font8x16, COLOR_ERROR_RED, COLOR_BG_WINDOW, (DWIN_WIDTH - MENU_CHR_W * 20) / 2, 270, GET_TEXT_F(MSG_TURN_OFF));
 }
 
 #if ENABLED(SCROLL_LONG_FILENAMES)
@@ -1950,7 +1952,7 @@ void redrawSDList() {
   }
   else {
     dwinDrawRectangle(1, COLOR_BG_RED, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
-    dwinDrawString(false, font16x32, COLOR_YELLOW, COLOR_BG_RED, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), F("No Media"));
+    dwinDrawString(false, font16x32, COLOR_YELLOW, COLOR_BG_RED, (DWIN_WIDTH - MENU_CHR_W * 8) / 2, MBASE(3), F("No Media"));
   }
 }
 
@@ -4298,7 +4300,7 @@ void dwinHandleScreen() {
     #if HAS_HEATED_BED
       case ID_BedTemp:      hmiBedTemp(); break;
     #endif
-    #if HAS_PREHEAT && HAS_FAN
+    #if ALL(HAS_PREHEAT, HAS_FAN)
       case ID_FanSpeed:     hmiFanSpeed(); break;
     #endif
     case ID_PrintSpeed:     hmiPrintSpeed(); break;

Marlin/src/lcd/e3v2/jyersui/dwin.cpp

@@ -952,10 +952,6 @@ void JyersDWIN::drawPopup(FSTR_P const line1, FSTR_P const line2, FSTR_P const l
   }
 }
 
-void MarlinUI::kill_screen(FSTR_P const error, FSTR_P const) {
-  jyersDWIN.drawPopup(F("Printer Kill Reason:"), error, F("Restart Required"), Proc_Wait, ICON_BLTouch);
-}
-
 void JyersDWIN::popupSelect() {
   const uint16_t c1 = selection ? COLOR_BG_WINDOW : getColor(eeprom_settings.highlight_box, COLOR_WHITE),
                  c2 = selection ? getColor(eeprom_settings.highlight_box, COLOR_WHITE) : COLOR_BG_WINDOW;
@@ -1318,9 +1314,8 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
               drawFloat(current_position.e, row);
             }
             else {
-              if (thermalManager.targetTooColdToExtrude(0)) {
+              if (thermalManager.targetTooColdToExtrude(0))
                 popupHandler(Popup_ETemp);
-              }
               else {
                 if (thermalManager.temp_hotend[0].is_below_target(2)) {
                   popupHandler(Popup_Heating);
@@ -1749,9 +1744,8 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
             if (draw)
               drawMenuItem(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_FILAMENTUNLOAD));
             else {
-              if (thermalManager.targetTooColdToExtrude(0)) {
+              if (thermalManager.targetTooColdToExtrude(0))
                 popupHandler(Popup_ETemp);
-              }
               else {
                 if (thermalManager.temp_hotend[0].is_below_target(2)) {
                   popupHandler(Popup_Heating);
@@ -3987,7 +3981,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
       }
       break;
 
-    #if HAS_PREHEAT && HAS_HOTEND
+    #if ALL(HAS_PREHEAT, HAS_HOTEND)
 
       case ID_PreheatHotend:
 
@@ -4298,7 +4292,7 @@ uint8_t JyersDWIN::getMenuSize(const uint8_t menu) {
     #endif
     case ID_Tune:           return TUNE_TOTAL;
 
-    #if HAS_PREHEAT && HAS_HOTEND
+    #if ALL(HAS_PREHEAT, HAS_HOTEND)
       case ID_PreheatHotend: return PREHEATHOTEND_TOTAL;
     #endif
 
@@ -4313,26 +4307,26 @@ uint8_t JyersDWIN::getMenuSize(const uint8_t menu) {
 
 void JyersDWIN::popupHandler(const PopupID popupid, const bool option/*=false*/) {
   popup = last_popup = popupid;
-  FSTR_P const PWID = F("Please wait until done.");
+  FSTR_P const PWID = GET_TEXT_F(MSG_PLEASE_WAIT);
   switch (popupid) {
     case Popup_Pause:         drawPopup(GET_TEXT_F(MSG_PAUSE_PRINT), F(""), F(""), Proc_Popup); break;
     case Popup_Stop:          drawPopup(GET_TEXT_F(MSG_STOP_PRINT), F(""), F(""), Proc_Popup); break;
-    case Popup_Resume:        drawPopup(F("Resume Print?"), F("Looks Like the last"), F("print was interrupted."), Proc_Popup); break;
+    case Popup_Resume:        drawPopup(F("Resume Print?"), GET_TEXT_F(MSG_OUTAGE_RECOVERY2), GET_TEXT_F(MSG_OUTAGE_RECOVERY3), Proc_Popup); break;
     case Popup_ConfFilChange: drawPopup(F("Confirm Filament Change"), F(""), F(""), Proc_Popup); break;
     case Popup_PurgeMore:     drawPopup(F("Purge more filament?"), F("(Cancel to finish process)"), F(""), Proc_Popup); break;
     #if ENABLED(AUTO_BED_LEVELING_UBL)
       case Popup_SaveLevel:   drawPopup(GET_TEXT_F(MSG_LEVEL_BED_DONE), F("Save to EEPROM?"), F(""), Proc_Popup); break;
       case Popup_MeshSlot:    drawPopup(F("Mesh slot not selected"), F("(Confirm to select slot 0)"), F(""), Proc_Popup); break;
     #endif
     case Popup_ETemp:         drawPopup(GET_TEXT_F(MSG_HOTEND_TOO_COLD), F("Open Preheat Menu?"), F(""), Proc_Popup); break;
-    case Popup_ManualProbing: drawPopup(F("Manual Probing"), F("(Confirm to probe)"), F("(cancel to exit)"), Proc_Popup); break;
+    case Popup_ManualProbing: drawPopup(F("Manual Probing"), F("(Confirm to probe)"), F("(Cancel to exit)"), Proc_Popup); break;
     case Popup_Level:         drawPopup(GET_TEXT_F(MSG_BED_LEVELING), PWID, F(""), Proc_Wait, ICON_AutoLeveling); break;
     case Popup_Home:          drawPopup(option ? F("Parking") : GET_TEXT_F(MSG_HOMING), PWID, F(""), Proc_Wait, ICON_BLTouch); break;
     case Popup_MoveWait:      drawPopup(GET_TEXT_F(MSG_UBL_MOVING_TO_NEXT), PWID, F(""), Proc_Wait, ICON_BLTouch); break;
-    case Popup_Heating:       drawPopup(GET_TEXT_F(MSG_HEATING), PWID, F(""), Proc_Wait, ICON_BLTouch); break;
-    case Popup_FilLoad:       drawPopup(option ? F("Unloading Filament") : F("Loading Filament"), PWID, F(""), Proc_Wait, ICON_BLTouch); break;
-    case Popup_FilChange:     drawPopup(F("Filament Change"), F("Please wait for prompt."), F(""), Proc_Wait, ICON_BLTouch); break;
-    case Popup_TempWarn:      drawPopup(option ? F("Nozzle temp too low!") : F("Nozzle temp too high!"), F(""), F(""), Proc_Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
+    case Popup_Heating:       drawPopup(GET_TEXT_F(MSG_HEATING), PWID, F(""), Proc_Wait, ICON_TempTooLow); break;
+    case Popup_FilLoad:       drawPopup(option ? GET_TEXT_F(MSG_UNLOADING_FILAMENT) : GET_TEXT_F(MSG_LOADING_FILAMENT), PWID, F(""), Proc_Wait, ICON_BLTouch); break;
+    case Popup_FilChange:     drawPopup(F("Filament Change"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Proc_Wait, ICON_BLTouch); break;
+    case Popup_TempWarn:      drawPopup(option ? GET_TEXT_F(MSG_TEMP_TOO_HIGH) : GET_TEXT_F(MSG_TEMP_TOO_LOW), F(""), F(""), Proc_Wait, option ? ICON_TempTooHigh : ICON_TempTooLow); break;
     #if HAS_FILAMENT_SENSOR
       case Popup_Runout:      drawPopup(F("Filament Runout"), F(""), F(""), Proc_Wait, ICON_BLTouch); break;
     #endif
@@ -4932,12 +4926,6 @@ void JyersDWIN::update() {
   }
 }
 
-void MarlinUI::update() { jyersDWIN.update(); }
-
-#if HAS_LCD_BRIGHTNESS
-  void MarlinUI::_set_brightness() { dwinLCDBrightness(backlight ? brightness : 0); }
-#endif
-
 void JyersDWIN::stateUpdate() {
   if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
     if (!printing) startPrint(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
@@ -5144,6 +5132,20 @@ void JyersDWIN::resetSettings() {
   redrawScreen();
 }
 
+//
+// MarlinUI Functions
+//
+
+void MarlinUI::kill_screen(FSTR_P const error, FSTR_P const) {
+  jyersDWIN.drawPopup(F("Printer Kill Reason:"), error, F("Restart Required"), Proc_Wait, ICON_BLTouch);
+}
+
+void MarlinUI::update() { jyersDWIN.update(); }
+
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() { dwinLCDBrightness(backlight ? brightness : 0); }
+#endif
+
 void MarlinUI::init_lcd() {
   delay(800);
   SERIAL_ECHOPGM("\nDWIN handshake ");

Marlin/src/lcd/e3v2/proui/dwin.cpp

@@ -72,7 +72,7 @@
   #define HAS_ONESTEP_LEVELING 1
 #endif
 
-#if HAS_MESH || (HAS_LEVELING && HAS_ZOFFSET_ITEM)
+#if HAS_MESH || ALL(HAS_LEVELING, HAS_ZOFFSET_ITEM)
   #include "../../../feature/bedlevel/bedlevel.h"
   #include "bedlevel_tools.h"
 #endif
@@ -3199,7 +3199,7 @@ void drawPrepareMenu() {
     checkkey = ID_Menu;
     if (SET_MENU(trammingMenu, MSG_BED_TRAMMING, items)) {
       BACK_ITEM(drawPrepareMenu);
-      #if HAS_BED_PROBE && HAS_MESH
+      #if ALL(HAS_BED_PROBE, HAS_MESH)
         MENU_ITEM(ICON_Tram, MSG_TRAMMING_WIZARD, onDrawMenuItem, trammingwizard);
         EDIT_ITEM(ICON_Version, MSG_BED_TRAMMING_MANUAL, onDrawChkbMenu, setManualTramming, &hmiData.fullManualTramming);
       #elif !HAS_BED_PROBE && HAS_ZOFFSET_ITEM

Marlin/src/lcd/e3v2/proui/dwinui.h

@@ -117,6 +117,7 @@
 #define ICON_SetPreheat10     ICON_SetCustomPreheat
 #define ICON_ShapingX         ICON_MoveX
 #define ICON_ShapingY         ICON_MoveY
+#define ICON_ShapingZ         ICON_MoveZ
 #define ICON_Sound            ICON_Cool
 #define ICON_TMCSet           ICON_PrintSize
 #define ICON_TMCXSet          ICON_MoveX

Marlin/src/lcd/language/language_en.h

@@ -407,21 +407,21 @@ namespace LanguageNarrow_en {
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID tuning done");
   LSTR MSG_PID_AUTOTUNE_FAILED            = _UxGT("Autotune failed!");
 
-  LSTR MSG_PID_FOR_NOZZLE                 = _UxGT("for Nozzle is running.");
-  LSTR MSG_PID_FOR_BED                    = _UxGT("for BED is running.");
-  LSTR MSG_PID_FOR_CHAMBER                = _UxGT("for CHAMBER is running.");
+  LSTR MSG_PID_FOR_NOZZLE                 = _UxGT("for Nozzle is running");
+  LSTR MSG_PID_FOR_BED                    = _UxGT("for BED is running");
+  LSTR MSG_PID_FOR_CHAMBER                = _UxGT("for CHAMBER is running");
 
   LSTR MSG_TEMP_NOZZLE                    = _UxGT("Nozzle Temperature");
   LSTR MSG_TEMP_BED                       = _UxGT("Bed Temperature");
   LSTR MSG_TEMP_CHAMBER                   = _UxGT("Chamber Temperature");
 
-  LSTR MSG_BAD_HEATER_ID                  = _UxGT("Bad extruder.");
-  LSTR MSG_TEMP_TOO_HIGH                  = _UxGT("Temperature too high.");
+  LSTR MSG_BAD_HEATER_ID                  = _UxGT("Bad extruder");
+  LSTR MSG_TEMP_TOO_HIGH                  = _UxGT("Temperature too high");
   LSTR MSG_TEMP_TOO_LOW                   = _UxGT("Temperature too low");
 
-  LSTR MSG_PID_BAD_HEATER_ID              = _UxGT("Autotune failed! Bad extruder.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed! Temperature too high.");
-  LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
+  LSTR MSG_PID_BAD_HEATER_ID              = _UxGT("Autotune failed! Bad extruder");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed! Temperature too high");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout");
 
   LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("Testing heat loss");
   LSTR MSG_MPC_HEATING_PAST_200           = _UxGT("Heating to >200C");
@@ -568,6 +568,8 @@ namespace LanguageNarrow_en {
   LSTR MSG_STOP_PRINT                     = _UxGT("Stop Print");
   LSTR MSG_CANCEL_PRINT                   = _UxGT("Cancel Print");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Power Outage");
+  LSTR MSG_OUTAGE_RECOVERY2               = _UxGT("It looks like the last");
+  LSTR MSG_OUTAGE_RECOVERY3               = _UxGT("print was interrupted");
   LSTR MSG_RESUME_BED_TEMP                = _UxGT("Resume Bed Temp");
   LSTR MSG_HOST_START_PRINT               = _UxGT("Host Start");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Print Obj");

Marlin/src/lcd/marlinui.cpp

@@ -1745,6 +1745,8 @@ uint8_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t ind,
     pgm ? host_notify_P(ustr) : host_notify(ustr);
   }
   void MarlinUI::status_printf_P(int8_t level, PGM_P const pfmt, ...) {
+    if (set_alert_level(level)) return;
+
     MString<30> msg;
 
     va_list args;