MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Wrap main menu external declarations

Browse Source
This commit is contained in:
Scott Lahteine 2019-06-17 21:44:23 -05:00
parent da5bdea324
commit 6b2d42434c
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,14 +35,6 @@
#include "../../module/stepper.h" #include "../../module/stepper.h"
#include "../../sd/cardreader.h" #include "../../sd/cardreader.h"
#if ENABLED(POWER_LOSS_RECOVERY)
#include "../../feature/power_loss_recovery.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_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))
@ -60,11 +52,23 @@ void menu_tune();
void menu_motion(); void menu_motion();
void menu_temperature(); void menu_temperature();
void menu_configuration(); void menu_configuration();
void menu_user();
void menu_temp_e0_filament_change(); #if ENABLED(CUSTOM_USER_MENUS)
void menu_change_filament(); void menu_user();
void menu_info(); #endif
void menu_led();
#if ENABLED(ADVANCED_PAUSE_FEATURE)
void menu_temp_e0_filament_change();
void menu_change_filament();
#endif
#if ENABLED(LCD_INFO_MENU)
void menu_info();
#endif
#if ENABLED(LED_CONTROL_MENU)
void menu_led();
#endif
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
void menu_mixer(); void menu_mixer();
@ -82,14 +86,17 @@ void menu_led();
#endif #endif
#endif #endif
#if HAS_GAME_MENU #if HAS_GAMES
void menu_game(); #include "game/game.h"
#elif ENABLED(MARLIN_BRICKOUT) #if HAS_GAME_MENU
void lcd_goto_brickout(); void menu_game();
#elif ENABLED(MARLIN_INVADERS) #elif ENABLED(MARLIN_BRICKOUT)
void lcd_goto_invaders(); void lcd_goto_brickout();
#elif ENABLED(MARLIN_SNAKE) #elif ENABLED(MARLIN_INVADERS)
void lcd_goto_snake(); void lcd_goto_invaders();
#elif ENABLED(MARLIN_SNAKE)
void lcd_goto_snake();
#endif
#endif #endif
void menu_main() { void menu_main() {