Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce waits during filament change #18738

Merged
merged 3 commits into from
Jul 23, 2020
Merged

Reduce waits during filament change #18738

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f456de7
Reduce waits during filament change
InsanityAutomation Mar 20, 2020
664d9c2
Update pause.cpp
thinkyhead Jul 23, 2020
215f019
Update pause.cpp
thinkyhead Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Marlin/src/feature/pause.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ fil_change_settings_t fc_settings[EXTRUDERS];
*
* Returns 'true' if heating was completed, 'false' for abort
*/
static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) {
static bool ensure_safe_temperature(const bool wait=true, const PauseMode mode=PAUSE_MODE_SAME) {

#if ENABLED(PREVENT_COLD_EXTRUSION)
if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder)) {
Expand All @@ -134,7 +134,13 @@ static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) {
UNUSED(mode);
#endif

return thermalManager.wait_for_hotend(active_extruder);
if (wait)
return thermalManager.wait_for_hotend(active_extruder);

while (ABS(thermalManager.degHotend(active_extruder) - thermalManager.degTargetHotend(active_extruder)) > TEMP_WINDOW)
idle();

return true;
}

/**
Expand All @@ -156,7 +162,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
) {
TERN(HAS_LCD_MENU,,UNUSED(show_lcd));

if (!ensure_safe_temperature(mode)) {
if (!ensure_safe_temperature(false, mode)) {
#if HAS_LCD_MENU
if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_STATUS, mode);
#endif
Expand Down Expand Up @@ -291,7 +297,7 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
constexpr float mix_multiplier = 1.0;
#endif

if (!ensure_safe_temperature(mode)) {
if (!ensure_safe_temperature(false, mode)) {
#if HAS_LCD_MENU
if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_STATUS);
#endif
Expand Down Expand Up @@ -498,7 +504,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);

// Wait for the heaters to reach the target temperatures
ensure_safe_temperature();
ensure_safe_temperature(false);

// Show the prompt to continue
show_continue_prompt(is_reload);
Expand Down Expand Up @@ -587,6 +593,8 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
// Unretract
unscaled_e_move(PAUSE_PARK_RETRACT_LENGTH, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));

ensure_safe_temperature();

// Intelligent resuming
#if ENABLED(FWRETRACT)
// If retracted before goto pause
Expand Down