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
25c58928
Commit
25c58928
authored
9 years ago
by
Simone Primarosa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for see the Power Consumption
parent
9e517011
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
15 deletions
+20
-15
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+20
-15
No files found.
MarlinKimbra/ultralcd.cpp
View file @
25c58928
...
...
@@ -33,10 +33,14 @@ int gumPreheatFanSpeed;
const
long
baudrates
[]
=
{
9600
,
14400
,
19200
,
28800
,
38400
,
56000
,
115200
,
250000
};
int
baudrate_position
=
-
1
;
#if
(HAS_FILAMENT_SENSOR && defined(FILAMENT_LCD_DISPLAY)) || (HAS_POWER_CONSUMPTION_SENSOR && defined(POWER_CONSUMPTION_LCD_DISPLAY))
#if
HAS_LCD_FILAMENT_SENSOR || HAS_LCD_POWER_SENSOR
unsigned
long
message_millis
=
0
;
#endif
#if HAS_LCD_POWER_SENSOR
unsigned
long
print_millis
=
0
;
#endif
/* !Configuration settings */
//Function pointer to menu functions.
...
...
@@ -314,6 +318,21 @@ static void lcd_status_screen()
lcd_implementation_status_screen
();
lcd_status_update_delay
=
10
;
/* redraw the main screen every second. This is easier then trying keep track of all things that change on the screen */
}
#if HAS_LCD_POWER_SENSOR
if
(
millis
()
>
print_millis
+
2000
)
print_millis
=
millis
();
#endif
#if HAS_LCD_FILAMENT_SENSOR || HAS_LCD_POWER_SENSOR
#if HAS_LCD_FILAMENT_SENSOR && HAS_LCD_POWER_SENSOR
if
(
millis
()
>
message_millis
+
15000
)
#else
if
(
millis
()
>
message_millis
+
10000
)
#endif
{
message_millis
=
millis
();
}
#endif
#ifdef ULTIPANEL
...
...
@@ -343,16 +362,6 @@ static void lcd_status_screen()
currentMenu
==
lcd_status_screen
#endif
);
#if (HAS_FILAMENT_SENSOR && defined(FILAMENT_LCD_DISPLAY)) || (HAS_POWER_CONSUMPTION_SENSOR && defined(POWER_CONSUMPTION_LCD_DISPLAY))
#if (HAS_FILAMENT_SENSOR && defined(FILAMENT_LCD_DISPLAY)) && (HAS_POWER_CONSUMPTION_SENSOR && defined(POWER_CONSUMPTION_LCD_DISPLAY))
if
(
millis
()
>
message_millis
+
15000
)
#else
if
(
millis
()
>
message_millis
+
10000
)
#endif
{
message_millis
=
millis
();
}
#endif
}
#ifdef ULTIPANEL_FEEDMULTIPLY
...
...
@@ -1618,10 +1627,6 @@ void lcd_finishstatus(bool persist=false) {
#endif
#endif
lcdDrawUpdate
=
2
;
#ifdef FILAMENT_LCD_DISPLAY
message_millis
=
millis
();
//get status message to show up for a while
#endif
}
#if defined(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
...
...
This diff is collapsed.
Click to expand it.
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