Browse Source

Put the MMU2 menu with the others

pull/1/head
Scott Lahteine 6 years ago
parent
commit
f269766408
  1. 2
      Marlin/src/feature/prusa_MMU2/mmu2.cpp
  2. 2
      Marlin/src/gcode/feature/pause/M600.cpp
  3. 2
      Marlin/src/lcd/menu/menu_main.cpp
  4. 6
      Marlin/src/lcd/menu/menu_mmu2.cpp
  5. 11
      Marlin/src/lcd/menu/menu_mmu2.h

2
Marlin/src/feature/prusa_MMU2/mmu2.cpp

@ -25,7 +25,7 @@
#if ENABLED(PRUSA_MMU2)
#include "mmu2.h"
#include "mmu2_menu.h"
#include "../../lcd/menu/menu_mmu2.h"
MMU2 mmu2;

2
Marlin/src/gcode/feature/pause/M600.cpp

@ -38,7 +38,7 @@
#endif
#if ENABLED(PRUSA_MMU2)
#include "../../../feature/prusa_MMU2/mmu2_menu.h"
#include "../../../lcd/menu/menu_mmu2.h"
#endif
/**

2
Marlin/src/lcd/menu/menu_main.cpp

@ -87,7 +87,7 @@ void menu_abort_confirm() {
}
#if ENABLED(PRUSA_MMU2)
#include "../../feature/prusa_MMU2/mmu2_menu.h"
#include "../../lcd/menu/menu_mmu2.h"
#endif
void menu_tune();

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

@ -24,9 +24,9 @@
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
#include "mmu2.h"
#include "mmu2_menu.h"
#include "../../lcd/menu/menu.h"
#include "../../feature/prusa_MMU2/mmu2.h"
#include "menu_mmu2.h"
#include "menu.h"
uint8_t currentTool;
bool mmuMenuWait;

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

@ -19,13 +19,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#pragma once
#include "../../inc/MarlinConfig.h"
#include <stdint.h>
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
extern void menu_mmu2();
extern void mmu2_M600();
extern uint8_t mmu2_chooseFilament();
#endif
extern void menu_mmu2();
extern void mmu2_M600();
extern uint8_t mmu2_chooseFilament();
Loading…
Cancel
Save