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

🚸 Wait for cooldown in MarlinUI power-off (#23476)

Browse source
This commit is contained in:
mistic100 2022-01-08 10:51:21 +01:00 committed by Scott Lahteine
parent d7b7b570c7
commit b435487da7
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/lcd/marlinui.cpp
View file

@ -1553,11 +1553,13 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
TERN_(HAS_LCD_MENU, return_to_status()); TERN_(HAS_LCD_MENU, return_to_status());
} }
#if BOTH(PSU_CONTROL, PS_OFF_CONFIRM) #if BOTH(HAS_LCD_MENU, PSU_CONTROL)
void MarlinUI::poweroff() { void MarlinUI::poweroff() {
queue.inject(F("M81")); queue.inject(F("M81" TERN_(POWER_OFF_WAIT_FOR_COOLDOWN, "S")));
goto_previous_screen(); return_to_status();
} }
#endif #endif
void MarlinUI::flow_fault() { void MarlinUI::flow_fault() {

2
Marlin/src/lcd/marlinui.h
View file

@ -373,7 +373,7 @@ public:
static void resume_print(); static void resume_print();
static void flow_fault(); static void flow_fault();
#if BOTH(PSU_CONTROL, PS_OFF_CONFIRM) #if BOTH(HAS_LCD_MENU, PSU_CONTROL)
static void poweroff(); static void poweroff();
#endif #endif

2
Marlin/src/lcd/menu/menu_main.cpp
View file

@ -380,7 +380,7 @@ void menu_main() {
GET_TEXT(MSG_SWITCH_PS_OFF), (const char *)nullptr, PSTR("?") GET_TEXT(MSG_SWITCH_PS_OFF), (const char *)nullptr, PSTR("?")
); );
#else #else
GCODES_ITEM(MSG_SWITCH_PS_OFF, PSTR("M81")); ACTION_ITEM(MSG_SWITCH_PS_OFF, ui.poweroff);
#endif #endif
else else
GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80")); GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));