Update criteria for PAUSE/RESUME/STOP menu items (#13294)
This commit is contained in:
parent
56fdcf93d1
commit
4771e372a1
1 changed files with 67 additions and 52 deletions
|
@ -46,7 +46,12 @@
|
||||||
#include "../../feature/host_actions.h"
|
#include "../../feature/host_actions.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void lcd_pause() {
|
#define MACHINE_CAN_STOP (ENABLED(SDSUPPORT) || ENABLED(HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL))
|
||||||
|
#define MACHINE_CAN_PAUSE (ENABLED(SDSUPPORT) || ENABLED(HOST_PROMPT_SUPPORT) || ENABLED(PARK_HEAD_ON_PAUSE) || defined(ACTION_ON_PAUSE))
|
||||||
|
|
||||||
|
#if MACHINE_CAN_PAUSE
|
||||||
|
|
||||||
|
void lcd_pause_job() {
|
||||||
#if ENABLED(POWER_LOSS_RECOVERY)
|
#if ENABLED(POWER_LOSS_RECOVERY)
|
||||||
if (recovery.enabled) recovery.save(true, false);
|
if (recovery.enabled) recovery.save(true, false);
|
||||||
#endif
|
#endif
|
||||||
|
@ -64,18 +69,22 @@ void lcd_pause() {
|
||||||
host_action_pause();
|
host_action_pause();
|
||||||
#endif
|
#endif
|
||||||
planner.synchronize();
|
planner.synchronize();
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcd_resume() {
|
void lcd_resume() {
|
||||||
#if ENABLED(SDSUPPORT)
|
#if ENABLED(SDSUPPORT)
|
||||||
if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24"));
|
if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24"));
|
||||||
#endif
|
#endif
|
||||||
#ifdef ACTION_ON_RESUME
|
#ifdef ACTION_ON_RESUME
|
||||||
host_action_resume();
|
host_action_resume();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void lcd_stop() {
|
#endif // MACHINE_CAN_PAUSE
|
||||||
|
|
||||||
|
#if MACHINE_CAN_STOP
|
||||||
|
|
||||||
|
void lcd_abort_job() {
|
||||||
#if ENABLED(SDSUPPORT)
|
#if ENABLED(SDSUPPORT)
|
||||||
wait_for_heatup = wait_for_user = false;
|
wait_for_heatup = wait_for_user = false;
|
||||||
card.flag.abort_sd_printing = true;
|
card.flag.abort_sd_printing = true;
|
||||||
|
@ -88,14 +97,16 @@ void lcd_stop() {
|
||||||
#endif
|
#endif
|
||||||
ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1);
|
ui.set_status_P(PSTR(MSG_PRINT_ABORTED), -1);
|
||||||
ui.return_to_status();
|
ui.return_to_status();
|
||||||
}
|
}
|
||||||
|
|
||||||
void menu_abort_confirm() {
|
void menu_abort_confirm() {
|
||||||
START_MENU();
|
START_MENU();
|
||||||
MENU_BACK(MSG_MAIN);
|
MENU_BACK(MSG_MAIN);
|
||||||
MENU_ITEM(function, MSG_STOP_PRINT, lcd_stop);
|
MENU_ITEM(function, MSG_STOP_PRINT, lcd_abort_job);
|
||||||
END_MENU();
|
END_MENU();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // MACHINE_CAN_STOP
|
||||||
|
|
||||||
#if ENABLED(PRUSA_MMU2)
|
#if ENABLED(PRUSA_MMU2)
|
||||||
#include "../../lcd/menu/menu_mmu2.h"
|
#include "../../lcd/menu/menu_mmu2.h"
|
||||||
|
@ -139,8 +150,10 @@ void menu_main() {
|
||||||
;
|
;
|
||||||
|
|
||||||
if (busy) {
|
if (busy) {
|
||||||
MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause);
|
#if MACHINE_CAN_PAUSE
|
||||||
#if ENABLED(SDSUPPORT) || defined(ACTION_ON_CANCEL)
|
MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_pause_job);
|
||||||
|
#endif
|
||||||
|
#if MACHINE_CAN_STOP
|
||||||
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_abort_confirm);
|
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_abort_confirm);
|
||||||
#endif
|
#endif
|
||||||
MENU_ITEM(submenu, MSG_TUNE, menu_tune);
|
MENU_ITEM(submenu, MSG_TUNE, menu_tune);
|
||||||
|
@ -170,11 +183,13 @@ void menu_main() {
|
||||||
}
|
}
|
||||||
#endif // !HAS_ENCODER_WHEEL && SDSUPPORT
|
#endif // !HAS_ENCODER_WHEEL && SDSUPPORT
|
||||||
|
|
||||||
#if ENABLED(SDSUPPORT) || ENABLED(HOST_ACTION_COMMANDS)
|
#if MACHINE_CAN_PAUSE
|
||||||
#if DISABLED(HOST_ACTION_COMMANDS)
|
const bool paused = (print_job_timer.isPaused()
|
||||||
if (card_open && card.isPaused())
|
#if ENABLED(SDSUPPORT)
|
||||||
|
|| card.isPaused()
|
||||||
#endif
|
#endif
|
||||||
MENU_ITEM(function, MSG_RESUME_PRINT, lcd_resume);
|
);
|
||||||
|
if (paused) MENU_ITEM(function, MSG_RESUME_PRINT, lcd_resume);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MENU_ITEM(submenu, MSG_MOTION, menu_motion);
|
MENU_ITEM(submenu, MSG_MOTION, menu_motion);
|
||||||
|
|
Reference in a new issue