Selaa lähdekoodia

Wrap main menu external declarations

Scott Lahteine 5 vuotta sitten
vanhempi
commit
6b2d42434c
1 muutettua tiedostoa jossa 28 lisäystä ja 21 poistoa
  1. 28
    21
      Marlin/src/lcd/menu/menu_main.cpp

+ 28
- 21
Marlin/src/lcd/menu/menu_main.cpp Näytä tiedosto

@@ -35,14 +35,6 @@
35 35
 #include "../../module/stepper.h"
36 36
 #include "../../sd/cardreader.h"
37 37
 
38
-#if ENABLED(POWER_LOSS_RECOVERY)
39
-  #include "../../feature/power_loss_recovery.h"
40
-#endif
41
-
42
-#if HAS_GAMES
43
-  #include "game/game.h"
44
-#endif
45
-
46 38
 #define MACHINE_CAN_STOP (EITHER(SDSUPPORT, HOST_PROMPT_SUPPORT) || defined(ACTION_ON_CANCEL))
47 39
 #define MACHINE_CAN_PAUSE (ANY(SDSUPPORT, HOST_PROMPT_SUPPORT, PARK_HEAD_ON_PAUSE) || defined(ACTION_ON_PAUSE))
48 40
 
@@ -60,11 +52,23 @@ void menu_tune();
60 52
 void menu_motion();
61 53
 void menu_temperature();
62 54
 void menu_configuration();
63
-void menu_user();
64
-void menu_temp_e0_filament_change();
65
-void menu_change_filament();
66
-void menu_info();
67
-void menu_led();
55
+
56
+#if ENABLED(CUSTOM_USER_MENUS)
57
+  void menu_user();
58
+#endif
59
+
60
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
61
+  void menu_temp_e0_filament_change();
62
+  void menu_change_filament();
63
+#endif
64
+
65
+#if ENABLED(LCD_INFO_MENU)
66
+  void menu_info();
67
+#endif
68
+
69
+#if ENABLED(LED_CONTROL_MENU)
70
+  void menu_led();
71
+#endif
68 72
 
69 73
 #if ENABLED(MIXING_EXTRUDER)
70 74
   void menu_mixer();
@@ -82,14 +86,17 @@ void menu_led();
82 86
   #endif
83 87
 #endif
84 88
 
85
-#if HAS_GAME_MENU
86
-  void menu_game();
87
-#elif ENABLED(MARLIN_BRICKOUT)
88
-  void lcd_goto_brickout();
89
-#elif ENABLED(MARLIN_INVADERS)
90
-  void lcd_goto_invaders();
91
-#elif ENABLED(MARLIN_SNAKE)
92
-  void lcd_goto_snake();
89
+#if HAS_GAMES
90
+  #include "game/game.h"
91
+  #if HAS_GAME_MENU
92
+    void menu_game();
93
+  #elif ENABLED(MARLIN_BRICKOUT)
94
+    void lcd_goto_brickout();
95
+  #elif ENABLED(MARLIN_INVADERS)
96
+    void lcd_goto_invaders();
97
+  #elif ENABLED(MARLIN_SNAKE)
98
+    void lcd_goto_snake();
99
+  #endif
93 100
 #endif
94 101
 
95 102
 void menu_main() {

Loading…
Peruuta
Tallenna