CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Games in Info menu, if enabled

Browse Source
This commit is contained in:
Scott Lahteine 2019-06-15 16:57:20 -05:00
parent 4c872a01f2
commit 9131b11944
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/src/lcd/menu/menu_info.cpp
View File

@ -28,6 +28,10 @@
#if HAS_LCD_MENU && ENABLED(LCD_INFO_MENU) #if HAS_LCD_MENU && ENABLED(LCD_INFO_MENU)
#if HAS_GAMES
#include "game/game.h"
#endif
#include "menu.h" #include "menu.h"
// #include "../../module/motion.h" // #include "../../module/motion.h"
// #include "../../module/planner.h" // #include "../../module/planner.h"
@ -220,6 +224,21 @@ void menu_info() {
#if ENABLED(PRINTCOUNTER) #if ENABLED(PRINTCOUNTER)
MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats); // Printer Stats > MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats); // Printer Stats >
#endif #endif
#if HAS_GAMES
MENU_ITEM(submenu, "Game", (
#if HAS_GAME_MENU
menu_game
#elif ENABLED(MARLIN_BRICKOUT)
brickout.enter_game
#elif ENABLED(MARLIN_INVADERS)
invaders.enter_game
#elif ENABLED(MARLIN_SNAKE)
snake.enter_game
#elif ENABLED(MARLIN_MAZE)
maze.enter_game
#endif
));
#endif
END_MENU(); END_MENU();
} }

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

@ -35,6 +35,10 @@
#include "../../module/stepper.h" #include "../../module/stepper.h"
#include "../../sd/cardreader.h" #include "../../sd/cardreader.h"
#if HAS_GAMES && DISABLED(LCD_INFO_MENU)
#include "game/game.h"
#endif
#define MACHINE_CAN_STOP (EITHER(SDSUPPORT, HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL)) #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)) #define MACHINE_CAN_PAUSE (ANY(SDSUPPORT, HOST_PROMPT_SUPPORT, PARK_HEAD_ON_PAUSE) || defined(ACTION_ON_PAUSE))
@ -86,19 +90,6 @@ void menu_configuration();
#endif #endif
#endif #endif
#if HAS_GAMES
#include "game/game.h"
#if HAS_GAME_MENU
void menu_game();
#elif ENABLED(MARLIN_BRICKOUT)
void lcd_goto_brickout();
#elif ENABLED(MARLIN_INVADERS)
void lcd_goto_invaders();
#elif ENABLED(MARLIN_SNAKE)
void lcd_goto_snake();
#endif
#endif
void menu_main() { void menu_main() {
START_MENU(); START_MENU();
MENU_BACK(MSG_WATCH); MENU_BACK(MSG_WATCH);
@ -249,7 +240,7 @@ void menu_main() {
#endif #endif
#endif #endif
#if ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE) #if HAS_GAMES && DISABLED(LCD_INFO_MENU)
MENU_ITEM(submenu, "Game", ( MENU_ITEM(submenu, "Game", (
#if HAS_GAME_MENU #if HAS_GAME_MENU
menu_game menu_game