Browse Source

Put the MMU2 menu with the others

Scott Lahteine 6 years ago
parent
commit
f269766408

+ 1
- 1
Marlin/src/feature/prusa_MMU2/mmu2.cpp View File

25
 #if ENABLED(PRUSA_MMU2)
25
 #if ENABLED(PRUSA_MMU2)
26
 
26
 
27
 #include "mmu2.h"
27
 #include "mmu2.h"
28
-#include "mmu2_menu.h"
28
+#include "../../lcd/menu/menu_mmu2.h"
29
 
29
 
30
 MMU2 mmu2;
30
 MMU2 mmu2;
31
 
31
 

+ 1
- 1
Marlin/src/gcode/feature/pause/M600.cpp View File

38
 #endif
38
 #endif
39
 
39
 
40
 #if ENABLED(PRUSA_MMU2)
40
 #if ENABLED(PRUSA_MMU2)
41
-  #include "../../../feature/prusa_MMU2/mmu2_menu.h"
41
+  #include "../../../lcd/menu/menu_mmu2.h"
42
 #endif
42
 #endif
43
 
43
 
44
 /**
44
 /**

+ 1
- 1
Marlin/src/lcd/menu/menu_main.cpp View File

87
 }
87
 }
88
 
88
 
89
 #if ENABLED(PRUSA_MMU2)
89
 #if ENABLED(PRUSA_MMU2)
90
-  #include "../../feature/prusa_MMU2/mmu2_menu.h"
90
+  #include "../../lcd/menu/menu_mmu2.h"
91
 #endif
91
 #endif
92
 
92
 
93
 void menu_tune();
93
 void menu_tune();

Marlin/src/feature/prusa_MMU2/mmu2_menu.cpp → Marlin/src/lcd/menu/menu_mmu2.cpp View File

24
 
24
 
25
 #if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
25
 #if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
26
 
26
 
27
-#include "mmu2.h"
28
-#include "mmu2_menu.h"
29
-#include "../../lcd/menu/menu.h"
27
+#include "../../feature/prusa_MMU2/mmu2.h"
28
+#include "menu_mmu2.h"
29
+#include "menu.h"
30
 
30
 
31
 uint8_t currentTool;
31
 uint8_t currentTool;
32
 bool mmuMenuWait;
32
 bool mmuMenuWait;

Marlin/src/feature/prusa_MMU2/mmu2_menu.h → Marlin/src/lcd/menu/menu_mmu2.h View File

19
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
  *
20
  *
21
  */
21
  */
22
-
23
 #pragma once
22
 #pragma once
24
 
23
 
25
-#include "../../inc/MarlinConfig.h"
24
+#include <stdint.h>
26
 
25
 
27
-#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
28
-  extern void menu_mmu2();
29
-  extern void mmu2_M600();
30
-  extern uint8_t mmu2_chooseFilament();
31
-#endif
26
+extern void menu_mmu2();
27
+extern void mmu2_M600();
28
+extern uint8_t mmu2_chooseFilament();

Loading…
Cancel
Save