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

Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x

Browse Source
This commit is contained in:
Bob-the-Kuhn
2019-04-12 22:07:12 -05:00
parent 5de7b5b35e bdfffee037
commit 9dd4252b39
365 changed files with 15127 additions and 4499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,19 +33,20 @@
#include "../../gcode/queue.h"
#include "../../module/printcounter.h"
#include "../../module/stepper.h"
#include "../../sd/cardreader.h"
#if ENABLED(POWER_LOSS_RECOVERY)
#include "../../feature/power_loss_recovery.h"
#endif
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
#endif
#if ENABLED(HOST_ACTION_COMMANDS)
#include "../../feature/host_actions.h"
#endif
#if HAS_GAMES
#include "game/game.h"
#endif
#define MACHINE_CAN_STOP (EITHER(SDSUPPORT, HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL))
#define MACHINE_CAN_PAUSE (ANY(SDSUPPORT, HOST_PROMPT_SUPPORT, PARK_HEAD_ON_PAUSE) || defined(ACTION_ON_PAUSE))
@ -152,7 +153,7 @@ void menu_main() {
START_MENU();
MENU_BACK(MSG_WATCH);
const bool busy = printer_busy()
const bool busy = IS_SD_PRINTING() || print_job_timer.isRunning()
#if ENABLED(SDSUPPORT)
, card_detected = card.isDetected()
, card_open = card_detected && card.isFileOpen()
@ -286,16 +287,19 @@ void menu_main() {
#endif
#endif
#if ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE)
#if ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
MENU_ITEM(submenu, "Game", (
#if HAS_GAME_MENU
menu_game
#elif ENABLED(MARLIN_BRICKOUT)
lcd_goto_brickout
brickout.enter_game
#elif ENABLED(MARLIN_INVADERS)
lcd_goto_invaders
invaders.enter_game
#elif ENABLED(MARLIN_SNAKE)
lcd_goto_snake
snake.enter_game
#elif ENABLED(MARLIN_MAZE)
maze.enter_game
#endif
));
#endif