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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
c8ac908d
Commit
c8ac908d
authored
Jan 21, 2020
by
Tanguy Pruvot
Committed by
Scott Lahteine
Jan 21, 2020
Browse files
Options
Downloads
Patches
Plain Diff
Release UI on G26 priming timeout (#16449)
parent
b57ef4b2
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/gcode/bedlevel/G26.cpp
+6
-5
6 additions, 5 deletions
Marlin/src/gcode/bedlevel/G26.cpp
with
6 additions
and
5 deletions
Marlin/src/gcode/bedlevel/G26.cpp
+
6
−
5
View file @
c8ac908d
...
@@ -418,15 +418,13 @@ inline bool turn_on_heaters() {
...
@@ -418,15 +418,13 @@ inline bool turn_on_heaters() {
inline
bool
prime_nozzle
()
{
inline
bool
prime_nozzle
()
{
const
feedRate_t
fr_slow_e
=
planner
.
settings
.
max_feedrate_mm_s
[
E_AXIS
]
/
15.0f
;
const
feedRate_t
fr_slow_e
=
planner
.
settings
.
max_feedrate_mm_s
[
E_AXIS
]
/
15.0f
;
#if HAS_LCD_MENU
#if HAS_LCD_MENU
&& DISABLED(TOUCH_BUTTONS) // ui.button_pressed issue with touchscreen
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
float
Total_Prime
=
0.0
;
float
Total_Prime
=
0.0
;
#endif
#endif
if
(
g26_prime_flag
==
-
1
)
{
// The user wants to control how much filament gets purged
if
(
g26_prime_flag
==
-
1
)
{
// The user wants to control how much filament gets purged
#if HAS_LCD_MENU
ui
.
capture
();
ui
.
capture
();
#endif
ui
.
set_status_P
(
GET_TEXT
(
MSG_G26_MANUAL_PRIME
),
99
);
ui
.
set_status_P
(
GET_TEXT
(
MSG_G26_MANUAL_PRIME
),
99
);
ui
.
chirp
();
ui
.
chirp
();
...
@@ -439,7 +437,10 @@ inline bool prime_nozzle() {
...
@@ -439,7 +437,10 @@ inline bool prime_nozzle() {
destination
.
e
+=
0.25
;
destination
.
e
+=
0.25
;
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
Total_Prime
+=
0.25
;
Total_Prime
+=
0.25
;
if
(
Total_Prime
>=
EXTRUDE_MAXLENGTH
)
return
G26_ERR
;
if
(
Total_Prime
>=
EXTRUDE_MAXLENGTH
)
{
ui
.
release
();
return
G26_ERR
;
}
#endif
#endif
prepare_internal_move_to_destination
(
fr_slow_e
);
prepare_internal_move_to_destination
(
fr_slow_e
);
destination
=
current_position
;
destination
=
current_position
;
...
...
...
...
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