Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
e1191ded
Unverified
Commit
e1191ded
authored
4 years ago
by
InsanityAutomation
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fast Filament Change temperature check (#18738)
parent
42fbd527
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/feature/pause.cpp
+13
-5
13 additions, 5 deletions
Marlin/src/feature/pause.cpp
with
13 additions
and
5 deletions
Marlin/src/feature/pause.cpp
+
13
−
5
View file @
e1191ded
...
...
@@ -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
))
{
...
...
@@ -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
;
}
/**
...
...
@@ -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
...
...
@@ -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
...
...
@@ -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
);
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment