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
52665f54
Commit
52665f54
authored
6 years ago
by
InsanityAutomation
Committed by
Scott Lahteine
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix bad Purge More logic (#13193)
parent
18458ec4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/feature/pause.cpp
+13
-7
13 additions, 7 deletions
Marlin/src/feature/pause.cpp
with
13 additions
and
7 deletions
Marlin/src/feature/pause.cpp
+
13
−
7
View file @
52665f54
...
...
@@ -137,6 +137,10 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
const
AdvancedPauseMode
mode
/*=ADVANCED_PAUSE_MODE_PAUSE_PRINT*/
DXC_ARGS
)
{
#if !HAS_LCD_MENU
UNUSED
(
show_lcd
);
#endif
if
(
!
ensure_safe_temperature
(
mode
))
{
#if HAS_LCD_MENU
if
(
show_lcd
)
lcd_advanced_pause_show_message
(
ADVANCED_PAUSE_MESSAGE_STATUS
,
mode
);
...
...
@@ -183,8 +187,6 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
#if HAS_LCD_MENU
if
(
show_lcd
)
lcd_advanced_pause_show_message
(
ADVANCED_PAUSE_MESSAGE_LOAD
,
mode
);
#else
UNUSED
(
show_lcd
);
#endif
#if ENABLED(DUAL_X_CARRIAGE)
...
...
@@ -276,7 +278,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
// Keep looping if "Purge More" was selected
}
while
(
false
#if HAS_LCD_MENU
&&
show_lcd
&&
advanced_pause_menu_response
==
ADVANCED_PAUSE_RESPONSE_EXTRUDE_MORE
||
(
show_lcd
&&
advanced_pause_menu_response
==
ADVANCED_PAUSE_RESPONSE_EXTRUDE_MORE
)
#endif
);
...
...
@@ -298,6 +300,10 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
bool
unload_filament
(
const
float
&
unload_length
,
const
bool
show_lcd
/*=false*/
,
const
AdvancedPauseMode
mode
/*=ADVANCED_PAUSE_MODE_PAUSE_PRINT*/
)
{
#if !HAS_LCD_MENU
UNUSED
(
show_lcd
);
#endif
if
(
!
ensure_safe_temperature
(
mode
))
{
#if HAS_LCD_MENU
if
(
show_lcd
)
lcd_advanced_pause_show_message
(
ADVANCED_PAUSE_MESSAGE_STATUS
);
...
...
@@ -308,8 +314,6 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
#if HAS_LCD_MENU
if
(
show_lcd
)
lcd_advanced_pause_show_message
(
ADVANCED_PAUSE_MESSAGE_UNLOAD
,
mode
);
#else
UNUSED
(
show_lcd
);
#endif
// Retract filament
...
...
@@ -361,6 +365,10 @@ uint8_t did_pause_print = 0;
bool
pause_print
(
const
float
&
retract
,
const
point_t
&
park_point
,
const
float
&
unload_length
/*=0*/
,
const
bool
show_lcd
/*=false*/
DXC_ARGS
)
{
#if !HAS_LCD_MENU
UNUSED
(
show_lcd
);
#endif
if
(
did_pause_print
)
return
false
;
// already paused
#if ENABLED(HOST_ACTION_COMMANDS)
...
...
@@ -382,8 +390,6 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
lcd_advanced_pause_show_message
(
ADVANCED_PAUSE_MESSAGE_STATUS
);
LCD_MESSAGEPGM
(
MSG_M600_TOO_COLD
);
}
#else
UNUSED
(
show_lcd
);
#endif
return
false
;
// unable to reach safe temperature
...
...
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