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
b4b87d3b
Commit
b4b87d3b
authored
Dec 30, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
6bbc315a
d53c162e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+2
-2
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
b4b87d3b
...
...
@@ -2885,8 +2885,8 @@ static void clean_up_after_endstop_move() {
for
(
int8_t
h
=
0
;
h
<
HOTENDS
;
++
h
)
{
ECHO_MV
(
" "
SERIAL_AT
,
h
);
ECHO_C
(
':'
);
#if ENABLED(
EXTRUDER
_WATTS)
ECHO_VM
((
EXTRUDER_WATTS
*
getHeaterPower
(
h
))
/
127.
"W"
);
#if ENABLED(
HOTEND
_WATTS)
ECHO_VM
((
HOTEND_WATTS
*
getHeaterPower
(
h
))
/
127
,
"W"
);
#else
ECHO_V
(
getHeaterPower
(
h
));
#endif
...
...
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