From 268511933287d618807ce441c1eb484e090da5a9 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Wed, 1 Jun 2022 05:21:59 +1200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20EXTRUDERS=200=20manual=20m?= =?UTF-8?q?ove=20compile=20(#24255)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/menu/menu_motion.cpp | 32 ++++++++++++----------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp index 86ecbd0b82..90bd015eff 100644 --- a/Marlin/src/lcd/menu/menu_motion.cpp +++ b/Marlin/src/lcd/menu/menu_motion.cpp @@ -35,15 +35,12 @@ #include "../../module/motion.h" #include "../../gcode/parser.h" // for inch support +#include "../../module/temperature.h" #if ENABLED(DELTA) #include "../../module/delta.h" #endif -#if ENABLED(PREVENT_COLD_EXTRUSION) - #include "../../module/temperature.h" -#endif - #if HAS_LEVELING #include "../../module/planner.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() { - #if ENABLED(PREVENT_COLD_EXTRUSION) - const bool too_cold = thermalManager.tooColdToExtrude(active_extruder); - if (too_cold) { - ui.goto_screen([]{ - MenuItem_confirm::select_screen( - GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK), - _goto_menu_move_distance_e, nullptr, - GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!") - ); - }); - return; - } - #endif - _goto_menu_move_distance_e(); + if (thermalManager.tooColdToExtrude(active_extruder)) { + ui.goto_screen([]{ + MenuItem_confirm::select_screen( + GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK), + _goto_menu_move_distance_e, nullptr, + GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!") + ); + }); + } + else + _goto_menu_move_distance_e(); } -#endif // E_MANUAL +#endif void menu_move() { START_MENU();