Put the MMU2 menu with the others
This commit is contained in:
parent
e1604198ff
commit
f269766408
5 changed files with 10 additions and 13 deletions
|
@ -25,7 +25,7 @@
|
||||||
#if ENABLED(PRUSA_MMU2)
|
#if ENABLED(PRUSA_MMU2)
|
||||||
|
|
||||||
#include "mmu2.h"
|
#include "mmu2.h"
|
||||||
#include "mmu2_menu.h"
|
#include "../../lcd/menu/menu_mmu2.h"
|
||||||
|
|
||||||
MMU2 mmu2;
|
MMU2 mmu2;
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(PRUSA_MMU2)
|
#if ENABLED(PRUSA_MMU2)
|
||||||
#include "../../../feature/prusa_MMU2/mmu2_menu.h"
|
#include "../../../lcd/menu/menu_mmu2.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -87,7 +87,7 @@ void menu_abort_confirm() {
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED(PRUSA_MMU2)
|
#if ENABLED(PRUSA_MMU2)
|
||||||
#include "../../feature/prusa_MMU2/mmu2_menu.h"
|
#include "../../lcd/menu/menu_mmu2.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void menu_tune();
|
void menu_tune();
|
||||||
|
|
|
@ -24,9 +24,9 @@
|
||||||
|
|
||||||
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
|
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
|
||||||
|
|
||||||
#include "mmu2.h"
|
#include "../../feature/prusa_MMU2/mmu2.h"
|
||||||
#include "mmu2_menu.h"
|
#include "menu_mmu2.h"
|
||||||
#include "../../lcd/menu/menu.h"
|
#include "menu.h"
|
||||||
|
|
||||||
uint8_t currentTool;
|
uint8_t currentTool;
|
||||||
bool mmuMenuWait;
|
bool mmuMenuWait;
|
|
@ -19,13 +19,10 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../inc/MarlinConfig.h"
|
#include <stdint.h>
|
||||||
|
|
||||||
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
|
extern void menu_mmu2();
|
||||||
extern void menu_mmu2();
|
extern void mmu2_M600();
|
||||||
extern void mmu2_M600();
|
extern uint8_t mmu2_chooseFilament();
|
||||||
extern uint8_t mmu2_chooseFilament();
|
|
||||||
#endif
|
|
Reference in a new issue