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
9e517011
Commit
9e517011
authored
Apr 01, 2015
by
Simone Primarosa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for see the Power Consumption
parent
46ec8357
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
8 deletions
+22
-8
dogm_lcd_implementation.h
MarlinKimbra/dogm_lcd_implementation.h
+22
-8
No files found.
MarlinKimbra/dogm_lcd_implementation.h
View file @
9e517011
...
...
@@ -280,10 +280,23 @@ static void lcd_implementation_status_screen() {
u8g
.
setPrintPos
(
80
,
48
);
if
(
starttime
!=
0
)
{
uint16_t
time
=
(
millis
()
-
starttime
)
/
60000
;
lcd_print
(
itostr2
(
time
/
60
));
lcd_print
(
':'
);
lcd_print
(
itostr2
(
time
%
60
));
#if HAS_LCD_POWER_SENSOR
if
(
millis
()
<
print_millis
+
1000
)
{
uint16_t
time
=
(
millis
()
-
starttime
)
/
60000
;
lcd_print
(
itostr2
(
time
/
60
));
lcd_print
(
':'
);
lcd_print
(
itostr2
(
time
%
60
));
}
else
{
lcd_print
(
itostr4
(
power_consumption_hour
-
startpower
));
lcd_print
(
'
Wh
'
);
}
#else
uint16_t
time
=
(
millis
()
-
starttime
)
/
60000
;
lcd_print
(
itostr2
(
time
/
60
));
lcd_print
(
':'
);
lcd_print
(
itostr2
(
time
%
60
));
#endif
}
else
{
lcd_printPGM
(
PSTR
(
"--:--"
));
...
...
@@ -358,12 +371,13 @@ static void lcd_implementation_status_screen() {
#else
u8g
.
setPrintPos
(
0
,
63
);
#endif
#if HAS_FILAMENT_SENSOR || HAS_POWER_CONSUMPTION_SENSOR
#if HAS_LCD_FILAMENT_SENSOR || HAS_LCD_POWER_SENSOR
if
(
millis
()
<
message_millis
+
5000
)
{
//Display both Status message line and Filament display on the last line
lcd_print
(
lcd_status_message
);
}
#if HAS_
POWER_CONSUMPTION_SENSOR && defined(POWER_CONSUMPTION_LCD_DISPLAY)
#if HAS_
FILAMENT_SENSOR && defined(FILAMENT_LCD_DISPLAY)
#if HAS_
LCD_POWER_SENSOR
#if HAS_
LCD_FILAMENT_SENSOR
else
if
(
millis
()
<
message_millis
+
10000
)
#else
else
...
...
@@ -376,7 +390,7 @@ static void lcd_implementation_status_screen() {
lcd_printPGM
(
PSTR
(
"Wh"
));
}
#endif
#if HAS_
FILAMENT_SENSOR && defined(FILAMENT_LCD_DISPLAY)
#if HAS_
LCD_FILAMENT_SENSOR
else
{
lcd_printPGM
(
PSTR
(
"D:"
));
lcd_print
(
ftostr12ns
(
filament_width_meas
));
...
...
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