sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize active/paused functions

Browse Source
This commit is contained in:
Scott Lahteine
2019-10-02 18:54:20 -05:00
parent 719615a6b6
commit 72d791a736
8 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -99,7 +99,7 @@ void menu_main() {
START_MENU();
BACK_ITEM(MSG_WATCH);
const bool busy = IS_SD_PRINTING() || print_job_timer.isRunning()
const bool busy = printingIsActive()
#if ENABLED(SDSUPPORT)
, card_detected = card.isMounted()
, card_open = card_detected && card.isFileOpen()
@ -147,12 +147,7 @@ void menu_main() {
#endif // !HAS_ENCODER_WHEEL && SDSUPPORT
#if MACHINE_CAN_PAUSE
const bool paused = (print_job_timer.isPaused()
#if ENABLED(SDSUPPORT)
|| card.isPaused()
#endif
);
if (paused) ACTION_ITEM(MSG_RESUME_PRINT, ui.resume_print);
if (printingIsPaused()) ACTION_ITEM(MSG_RESUME_PRINT, ui.resume_print);
#endif
SUBMENU(MSG_MOTION, menu_motion);