zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🎨 Misc. Cleanup

Browse source
This commit is contained in:
Scott Lahteine 2021-07-25 02:19:30 -05:00 committed by Scott Lahteine
parent e71fa2b649
commit c56ac0c34a
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/feature/pause.cpp
View file

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

1
Marlin/src/lcd/language/language_en.h
View file

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

6
Marlin/src/lcd/menu/menu_bed_corners.cpp
View file

@ -201,7 +201,7 @@ static void _lcd_level_bed_corners_get_next_position() {
void _lcd_draw_raise() { void _lcd_draw_raise() {
if (!ui.should_draw()) return; if (!ui.should_draw()) return;
MenuItem_confirm::select_screen( MenuItem_confirm::select_screen(
GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP) GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
, []{ corner_probing_done = true; wait_for_probe = false; } , []{ corner_probing_done = true; wait_for_probe = false; }
, []{ wait_for_probe = false; } , []{ wait_for_probe = false; }
, GET_TEXT(MSG_LEVEL_CORNERS_RAISE) , GET_TEXT(MSG_LEVEL_CORNERS_RAISE)
@ -212,9 +212,7 @@ static void _lcd_level_bed_corners_get_next_position() {
void _lcd_draw_level_prompt() { void _lcd_draw_level_prompt() {
if (!ui.should_draw()) return; if (!ui.should_draw()) return;
MenuItem_confirm::confirm_screen( MenuItem_confirm::confirm_screen(
[]{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR)); []{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR)); ui.return_to_status(); }
ui.return_to_status();
}
, []{ ui.goto_previous_screen_no_defer(); } , []{ ui.goto_previous_screen_no_defer(); }
, GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE) , GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE)
, (const char*)nullptr, PSTR("?") , (const char*)nullptr, PSTR("?")

1
Marlin/src/lcd/menu/menu_motion.cpp
View file

@ -184,7 +184,6 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
PGM_P const label = GET_TEXT(MSG_MOVE_N_MM); PGM_P const label = GET_TEXT(MSG_MOVE_N_MM);
char tmp[strlen_P(label) + 10 + 1], numstr[10]; char tmp[strlen_P(label) + 10 + 1], numstr[10];
sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr)); sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
#if DISABLED(HAS_GRAPHICAL_TFT) #if DISABLED(HAS_GRAPHICAL_TFT)
SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); }); SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780)); MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));