diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/prusa_MMU2/mmu2.cpp index aebd0ad9d..95e1a7d18 100644 --- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp +++ b/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; diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp index 72cc96f2d..7f5f17342 100644 --- a/Marlin/src/gcode/feature/pause/M600.cpp +++ b/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 /** diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 3834f353b..cad2c388d 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/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(); diff --git a/Marlin/src/feature/prusa_MMU2/mmu2_menu.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp similarity index 98% rename from Marlin/src/feature/prusa_MMU2/mmu2_menu.cpp rename to Marlin/src/lcd/menu/menu_mmu2.cpp index 6f2e186c0..e2f7b05d0 100644 --- a/Marlin/src/feature/prusa_MMU2/mmu2_menu.cpp +++ b/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; diff --git a/Marlin/src/feature/prusa_MMU2/mmu2_menu.h b/Marlin/src/lcd/menu/menu_mmu2.h similarity index 83% rename from Marlin/src/feature/prusa_MMU2/mmu2_menu.h rename to Marlin/src/lcd/menu/menu_mmu2.h index 52b1cbb6a..6c721e294 100644 --- a/Marlin/src/feature/prusa_MMU2/mmu2_menu.h +++ b/Marlin/src/lcd/menu/menu_mmu2.h @@ -19,13 +19,10 @@ * along with this program. If not, see . * */ - #pragma once -#include "../../inc/MarlinConfig.h" +#include -#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();