Bläddra i källkod

Misc. Cleanup

Scott Lahteine 2 år sedan
förälder
incheckning
3b57c3316a

+ 1
- 1
Marlin/src/MarlinCore.cpp Visa fil

@@ -1593,7 +1593,7 @@ void setup() {
1593 1593
     HMI_Init();
1594 1594
     DWIN_JPG_CacheTo1(Language_English);
1595 1595
     HMI_StartFrame(true);
1596
-    DWIN_StatusChanged(GET_TEXT(WELCOME_MSG));
1596
+    DWIN_StatusChanged_P(GET_TEXT(WELCOME_MSG));
1597 1597
   #endif
1598 1598
 
1599 1599
   #if HAS_SERVICE_INTERVALS && DISABLED(DWIN_CREALITY_LCD)

+ 2
- 2
Marlin/src/feature/pause.cpp Visa fil

@@ -535,8 +535,8 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
535 535
       const millis_t nozzle_timeout = SEC_TO_MS(PAUSE_PARK_NOZZLE_TIMEOUT);
536 536
 
537 537
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
538
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Reheat Done"), CONTINUE_STR));
539
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Reheat finished.")));
538
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_REHEATDONE), CONTINUE_STR));
539
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
540 540
       wait_for_user = true;
541 541
       nozzle_timed_out = false;
542 542
 

+ 1
- 0
Marlin/src/lcd/language/language_en.h Visa fil

@@ -727,6 +727,7 @@ namespace Language_en {
727 727
   #endif
728 728
   PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Reheat");
729 729
   PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Reheating...");
730
+  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Reheat Done");
730 731
 
731 732
   PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Z Probe Wizard");
732 733
   PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Probing Z Reference");

+ 2
- 4
Marlin/src/lcd/menu/menu_bed_corners.cpp Visa fil

@@ -201,7 +201,7 @@ static void _lcd_level_bed_corners_get_next_position() {
201 201
   void _lcd_draw_raise() {
202 202
     if (!ui.should_draw()) return;
203 203
     MenuItem_confirm::select_screen(
204
-      GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
204
+        GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
205 205
       , []{ corner_probing_done = true; wait_for_probe = false; }
206 206
       , []{ wait_for_probe = false; }
207 207
       , GET_TEXT(MSG_LEVEL_CORNERS_RAISE)
@@ -212,9 +212,7 @@ static void _lcd_level_bed_corners_get_next_position() {
212 212
   void _lcd_draw_level_prompt() {
213 213
     if (!ui.should_draw()) return;
214 214
     MenuItem_confirm::confirm_screen(
215
-      []{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR));
216
-          ui.return_to_status();
217
-      }
215
+        []{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR)); ui.return_to_status(); }
218 216
       , []{ ui.goto_previous_screen_no_defer(); }
219 217
       , GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE)
220 218
       , (const char*)nullptr, PSTR("?")

Laddar…
Avbryt
Spara