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
80ebe900
Commit
80ebe900
authored
May 31, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
49b252fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
MK_Main.cpp
MK/module/MK_Main.cpp
+5
-5
No files found.
MK/module/MK_Main.cpp
View file @
80ebe900
...
...
@@ -3008,7 +3008,7 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
now
=
millis
();
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print temp & remaining time every 1s while waiting
next_temp_ms
=
now
+
1000UL
;
#if HAS(TEMP_
HOTEND) || HAS(TEMP_BED
)
#if HAS(TEMP_
0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675
)
print_heaterstates
();
#endif
#if TEMP_RESIDENCY_TIME > 0
...
...
@@ -3083,7 +3083,9 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
now
=
millis
();
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print Temp Reading every 1 second while heating up.
next_temp_ms
=
now
+
1000UL
;
print_heaterstates
();
#if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675)
print_heaterstates
();
#endif
#if TEMP_BED_RESIDENCY_TIME > 0
ECHO_M
(
SERIAL_W
);
if
(
residency_start_ms
)
{
...
...
@@ -4865,9 +4867,7 @@ inline void gcode_G92() {
current_position
[
i
]
=
v
;
if
(
i
==
E_AXIS
)
{
#if DISABLED(MUVE_Z_PEEL)
plan_set_e_position
(
v
);
#endif
plan_set_e_position
(
v
);
}
else
{
position_shift
[
i
]
+=
v
-
p
;
// Offset the coordinate space
...
...
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