CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation with MMU2_MENUS disabled (#13140)

Browse Source
This commit is contained in:
Roman Moravčík 2019-02-12 19:55:49 +01:00 committed by Scott Lahteine
parent 584f9cd449
commit bace52afd7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/gcode/feature/pause/M600.cpp
View File

@ -37,7 +37,7 @@
#include "../../../lcd/ultralcd.h" #include "../../../lcd/ultralcd.h"
#endif #endif
#if ENABLED(PRUSA_MMU2) #if ENABLED(MMU2_MENUS)
#include "../../../lcd/menu/menu_mmu2.h" #include "../../../lcd/menu/menu_mmu2.h"
#endif #endif
@ -75,7 +75,7 @@ void GcodeSuite::M600() {
#endif #endif
// Show initial "wait for start" message // Show initial "wait for start" message
#if HAS_LCD_MENU && DISABLED(PRUSA_MMU2) #if HAS_LCD_MENU && DISABLED(MMU2_MENUS)
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT, target_extruder); lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT, target_extruder);
#endif #endif
@ -114,7 +114,7 @@ void GcodeSuite::M600() {
park_point.y += (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0); park_point.y += (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0);
#endif #endif
#if ENABLED(PRUSA_MMU2) #if ENABLED(MMU2_MENUS)
// For MMU2 reset retract and load/unload values so they don't mess with MMU filament handling // For MMU2 reset retract and load/unload values so they don't mess with MMU filament handling
constexpr float unload_length = 0.5f, constexpr float unload_length = 0.5f,
slow_load_length = 0.0f, slow_load_length = 0.0f,
@ -141,7 +141,7 @@ void GcodeSuite::M600() {
); );
if (pause_print(retract, park_point, unload_length, true DXC_PASS)) { if (pause_print(retract, park_point, unload_length, true DXC_PASS)) {
#if ENABLED(PRUSA_MMU2) #if ENABLED(MMU2_MENUS)
mmu2_M600(); mmu2_M600();
resume_print(slow_load_length, fast_load_length, 0, beep_count DXC_PASS); resume_print(slow_load_length, fast_load_length, 0, beep_count DXC_PASS);
#else #else