Browse Source

Misc. Cleanup

Scott Lahteine 4 years ago
parent
commit
3b57c3316a

+ 1
- 1
Marlin/src/MarlinCore.cpp View File

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

+ 2
- 2
Marlin/src/feature/pause.cpp View File

535
       const millis_t nozzle_timeout = SEC_TO_MS(PAUSE_PARK_NOZZLE_TIMEOUT);
535
       const millis_t nozzle_timeout = SEC_TO_MS(PAUSE_PARK_NOZZLE_TIMEOUT);
536
 
536
 
537
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
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
       wait_for_user = true;
540
       wait_for_user = true;
541
       nozzle_timed_out = false;
541
       nozzle_timed_out = false;
542
 
542
 

+ 1
- 0
Marlin/src/lcd/language/language_en.h View File

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

+ 2
- 4
Marlin/src/lcd/menu/menu_bed_corners.cpp View File

201
   void _lcd_draw_raise() {
201
   void _lcd_draw_raise() {
202
     if (!ui.should_draw()) return;
202
     if (!ui.should_draw()) return;
203
     MenuItem_confirm::select_screen(
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
       , []{ corner_probing_done = true; wait_for_probe = false; }
205
       , []{ corner_probing_done = true; wait_for_probe = false; }
206
       , []{ wait_for_probe = false; }
206
       , []{ wait_for_probe = false; }
207
       , GET_TEXT(MSG_LEVEL_CORNERS_RAISE)
207
       , GET_TEXT(MSG_LEVEL_CORNERS_RAISE)
212
   void _lcd_draw_level_prompt() {
212
   void _lcd_draw_level_prompt() {
213
     if (!ui.should_draw()) return;
213
     if (!ui.should_draw()) return;
214
     MenuItem_confirm::confirm_screen(
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
       , []{ ui.goto_previous_screen_no_defer(); }
216
       , []{ ui.goto_previous_screen_no_defer(); }
219
       , GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE)
217
       , GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE)
220
       , (const char*)nullptr, PSTR("?")
218
       , (const char*)nullptr, PSTR("?")

Loading…
Cancel
Save