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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
d70a4a38
Commit
d70a4a38
authored
Apr 7, 2015
by
Scott Lahteine
Browse files
Options
Downloads
Plain Diff
Merge pull request #1823 from AnHardt/splashscreen
Disable splash-screen when done once
parents
56aea5f8
6ae71489
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/dogm_lcd_implementation.h
+14
-9
14 additions, 9 deletions
Marlin/dogm_lcd_implementation.h
with
14 additions
and
9 deletions
Marlin/dogm_lcd_implementation.h
+
14
−
9
View file @
d70a4a38
...
...
@@ -186,6 +186,8 @@ char lcd_printPGM(const char* str) {
return
n
;
}
static
bool
show_splashscreen
=
true
;
static
void
lcd_implementation_init
()
{
#ifdef LCD_PIN_BL // Enable LCD backlight
...
...
@@ -219,6 +221,7 @@ static void lcd_implementation_init()
u8g
.
firstPage
();
do
{
if
(
show_splashscreen
)
{
u8g
.
drawBitmapP
(
offx
,
offy
,
START_BMPBYTEWIDTH
,
START_BMPHEIGHT
,
start_bmp
);
lcd_setFont
(
FONT_MENU
);
#ifndef STRING_SPLASH_LINE2
...
...
@@ -228,7 +231,9 @@ static void lcd_implementation_init()
u8g
.
drawStr
(
txt1X
,
u8g
.
getHeight
()
-
DOG_CHAR_HEIGHT
*
3
/
2
,
STRING_SPLASH_LINE1
);
u8g
.
drawStr
(
txt2X
,
u8g
.
getHeight
()
-
DOG_CHAR_HEIGHT
*
1
/
2
,
STRING_SPLASH_LINE2
);
#endif
}
}
while
(
u8g
.
nextPage
());
show_splashscreen
=
false
;
}
static
void
lcd_implementation_clear
()
{
}
// Automatically cleared by Picture Loop
...
...
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