bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🩹 Fix EXTRUDERS 0 manual move compile (#24255)

Browse Source
This commit is contained in:
ellensp 2022-06-01 05:21:59 +12:00 committed by Scott Lahteine
parent fc350701b2
commit 2685119332
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -35,15 +35,12 @@
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../gcode/parser.h" // for inch support #include "../../gcode/parser.h" // for inch support
#include "../../module/temperature.h"
#if ENABLED(DELTA) #if ENABLED(DELTA)
#include "../../module/delta.h" #include "../../module/delta.h"
#endif #endif
#if ENABLED(PREVENT_COLD_EXTRUSION)
#include "../../module/temperature.h"
#endif
#if HAS_LEVELING #if HAS_LEVELING
#include "../../module/planner.h" #include "../../module/planner.h"
#include "../../feature/bedlevel/bedlevel.h" #include "../../feature/bedlevel/bedlevel.h"
@ -210,23 +207,20 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
} }
inline void _menu_move_distance_e_maybe() { inline void _menu_move_distance_e_maybe() {
#if ENABLED(PREVENT_COLD_EXTRUSION) if (thermalManager.tooColdToExtrude(active_extruder)) {
const bool too_cold = thermalManager.tooColdToExtrude(active_extruder); ui.goto_screen([]{
if (too_cold) { MenuItem_confirm::select_screen(
ui.goto_screen([]{ GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK),
MenuItem_confirm::select_screen( _goto_menu_move_distance_e, nullptr,
GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK), GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!")
_goto_menu_move_distance_e, nullptr, );
GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!") });
); }
}); else
return; _goto_menu_move_distance_e();
}
#endif
_goto_menu_move_distance_e();
} }
#endif // E_MANUAL #endif
void menu_move() { void menu_move() {
START_MENU(); START_MENU();