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
d5c9f507
Commit
d5c9f507
authored
May 29, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LCD FILAMENT
parent
3cc825c5
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
50 deletions
+48
-50
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+45
-47
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+2
-2
ultralcd.h
MarlinKimbra/ultralcd.h
+1
-1
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
d5c9f507
This diff is collapsed.
Click to expand it.
MarlinKimbra/ultralcd.cpp
View file @
d5c9f507
...
...
@@ -377,7 +377,7 @@ static void lcd_status_screen() {
currentMenu
==
lcd_status_screen
#endif
);
#if
def FILAMENT_LCD_DISPLAY
#if
HAS_LCD_FILAMENT_SENSOR || HAS_LCD_POWER_SENSOR
previous_lcd_status_ms
=
millis
();
// get status message to show up for a while
#endif
}
...
...
@@ -1820,7 +1820,7 @@ void lcd_finishstatus(bool persist=false) {
#endif
lcdDrawUpdate
=
2
;
#if
def FILAMENT_LCD_DISPLAY
#if
HAS_LCD_FILAMENT_SENSOR || HAS_LCD_POWER_SENSOR
previous_lcd_status_ms
=
millis
();
//get status message to show up for a while
#endif
}
...
...
MarlinKimbra/ultralcd.h
View file @
d5c9f507
...
...
@@ -55,7 +55,7 @@
extern
bool
cancel_heatup
;
#if
(HAS_FILAMENT_SENSOR && ENABLED(FILAMENT_LCD_DISPLAY)) || (HAS_POWER_CONSUMPTION_SENSOR && ENABLED(POWER_CONSUMPTION_LCD_DISPLAY))
#if
HAS_LCD_FILAMENT_SENSOR || HAS_LCD_POWER_SENSOR
extern
millis_t
previous_lcd_status_ms
;
#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