|
@ -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,9 +207,7 @@ 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); |
|
|
|
|
|
if (too_cold) { |
|
|
|
|
|
ui.goto_screen([]{ |
|
|
ui.goto_screen([]{ |
|
|
MenuItem_confirm::select_screen( |
|
|
MenuItem_confirm::select_screen( |
|
|
GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK), |
|
|
GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK), |
|
@ -220,13 +215,12 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int |
|
|
GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!") |
|
|
GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!") |
|
|
); |
|
|
); |
|
|
}); |
|
|
}); |
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
#endif |
|
|
else |
|
|
_goto_menu_move_distance_e(); |
|
|
_goto_menu_move_distance_e(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#endif // E_MANUAL
|
|
|
#endif |
|
|
|
|
|
|
|
|
void menu_move() { |
|
|
void menu_move() { |
|
|
START_MENU(); |
|
|
START_MENU(); |
|
|