Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
8feaa0b2
Commit
8feaa0b2
authored
Jun 05, 2016
by
Stefy Lanza (nextime / spora )
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wait_tempbed has to be called only if there is a tempbed!
parent
8e0c00ec
Pipeline
#102
skipped
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
66 additions
and
62 deletions
+66
-62
MK_Main.cpp
MK/module/MK_Main.cpp
+66
-62
No files found.
MK/module/MK_Main.cpp
View file @
8feaa0b2
...
@@ -3117,7 +3117,8 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
...
@@ -3117,7 +3117,8 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
KEEPALIVE_STATE
(
IN_HANDLER
);
KEEPALIVE_STATE
(
IN_HANDLER
);
}
}
inline
void
wait_bed
(
bool
no_wait_for_cooling
=
true
)
{
#if HAS(TEMP_BED)
inline
void
wait_bed
(
bool
no_wait_for_cooling
=
true
)
{
#if TEMP_BED_RESIDENCY_TIME > 0
#if TEMP_BED_RESIDENCY_TIME > 0
millis_t
residency_start_ms
=
0
;
millis_t
residency_start_ms
=
0
;
...
@@ -3187,7 +3188,8 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
...
@@ -3187,7 +3188,8 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
}
while
(
!
cancel_heatup
&&
TEMP_BED_CONDITIONS
);
}
while
(
!
cancel_heatup
&&
TEMP_BED_CONDITIONS
);
LCD_MESSAGEPGM
(
MSG_BED_DONE
);
LCD_MESSAGEPGM
(
MSG_BED_DONE
);
KEEPALIVE_STATE
(
IN_HANDLER
);
KEEPALIVE_STATE
(
IN_HANDLER
);
}
}
#endif // HAS(TEMP_BED)
#if HAS(TEMP_CHAMBER)
#if HAS(TEMP_CHAMBER)
inline
void
wait_chamber
(
bool
no_wait_for_heating
=
true
)
{
inline
void
wait_chamber
(
bool
no_wait_for_heating
=
true
)
{
...
@@ -7882,8 +7884,10 @@ inline void gcode_M503() {
...
@@ -7882,8 +7884,10 @@ inline void gcode_M503() {
setTargetHotend
(
old_target_temperature
[
e
],
e
);
setTargetHotend
(
old_target_temperature
[
e
],
e
);
wait_heater
();
wait_heater
();
}
}
#if HAS(TEMP_BED)
setTargetBed
(
old_target_temperature_bed
);
setTargetBed
(
old_target_temperature_bed
);
wait_bed
();
wait_bed
();
#endif
}
}
// Show load message
// Show load message
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment