melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds a customizable screen timeout for the default boot screen

Browse Source
This commit is contained in:
João Brázio 2016-07-14 18:28:15 +01:00
parent 7202383695
commit f5234b0695
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Conditionals.h
View File

@ -55,7 +55,7 @@
#define LCD_CONTRAST_MIN 60 #define LCD_CONTRAST_MIN 60
#define LCD_CONTRAST_MAX 140 #define LCD_CONTRAST_MAX 140
#endif #endif
#if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL) #if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
#define DOGLCD #define DOGLCD
#define ULTIPANEL #define ULTIPANEL
@ -269,6 +269,10 @@
#endif #endif
#endif #endif
#ifndef BOOTSCREEN_TIMEOUT
#define BOOTSCREEN_TIMEOUT 2500
#endif
#else // CONFIGURATION_LCD #else // CONFIGURATION_LCD
#define CONDITIONALS_H #define CONDITIONALS_H

2
Marlin/Marlin_main.cpp
View File

@ -946,7 +946,7 @@ void setup() {
lcd_init(); lcd_init();
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
delay(1000); delay(BOOTSCREEN_TIMEOUT);
#elif ENABLED(ULTRA_LCD) #elif ENABLED(ULTRA_LCD)
bootscreen(); bootscreen();
lcd_init(); lcd_init();