Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
05b217c0
Commit
05b217c0
authored
8 years ago
by
Scott Lahteine
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #5930 from thinkyhead/rc_lcd_timeout_config
Make LCD_TIMEOUT_TO_STATUS configurable
parents
493e7385
c759c26c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/Conditionals_post.h
+5
-0
5 additions, 0 deletions
Marlin/Conditionals_post.h
Marlin/Configuration_adv.h
+3
-0
3 additions, 0 deletions
Marlin/Configuration_adv.h
Marlin/ultralcd.h
+0
-1
0 additions, 1 deletion
Marlin/ultralcd.h
with
8 additions
and
1 deletion
Marlin/Conditionals_post.h
+
5
−
0
View file @
05b217c0
...
@@ -726,4 +726,9 @@
...
@@ -726,4 +726,9 @@
#define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
#define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
#endif
#endif
// LCD timeout to status screen default is 15s
#ifndef LCD_TIMEOUT_TO_STATUS
#define LCD_TIMEOUT_TO_STATUS 15000
#endif
#endif // CONDITIONALS_POST_H
#endif // CONDITIONALS_POST_H
This diff is collapsed.
Click to expand it.
Marlin/Configuration_adv.h
+
3
−
0
View file @
05b217c0
...
@@ -425,6 +425,9 @@
...
@@ -425,6 +425,9 @@
// On the Info Screen, display XY with one decimal place when possible
// On the Info Screen, display XY with one decimal place when possible
//#define LCD_DECIMAL_SMALL_XY
//#define LCD_DECIMAL_SMALL_XY
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
#if ENABLED(SDSUPPORT)
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
...
...
This diff is collapsed.
Click to expand it.
Marlin/ultralcd.h
+
0
−
1
View file @
05b217c0
...
@@ -65,7 +65,6 @@
...
@@ -65,7 +65,6 @@
#define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
#define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
#define LCD_UPDATE_INTERVAL 100
#define LCD_UPDATE_INTERVAL 100
#define LCD_TIMEOUT_TO_STATUS 15000
#if ENABLED(ULTIPANEL)
#if ENABLED(ULTIPANEL)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment