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
c6ae23a5
Commit
c6ae23a5
authored
9 years ago
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Splash Screen duration
parent
90cfaf7b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
Configuration.h
MarlinKimbra/Configuration.h
+3
-0
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-1
conditionals.h
MarlinKimbra/conditionals.h
+8
-0
No files found.
MarlinKimbra/Configuration.h
View file @
c6ae23a5
...
...
@@ -408,6 +408,9 @@ your extruder heater takes 2 minutes to hit the target on heating.
// #define LCD_SCREEN_ROT_180
// #define LCD_SCREEN_ROT_270
// SPLASH SCREEN duration in millisecond
#define SPLASH_SCREEN_DURATION 2000 // Millisecond
/** Display Voltage Logic Selector on Alligator Board
0 = Voltage level 3.3V
1 = Voltage level 5V
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/Marlin_main.cpp
View file @
c6ae23a5
...
...
@@ -713,7 +713,7 @@ void setup() {
servo_init
();
lcd_init
();
_delay_ms
(
1000
);
// wait 1sec
to display the splash screen
_delay_ms
(
SPLASH_SCREEN_DURATION
);
// wait
to display the splash screen
#if HAS_CONTROLLERFAN
SET_OUTPUT
(
CONTROLLERFAN_PIN
);
//Set pin used for driver cooling fan
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/conditionals.h
View file @
c6ae23a5
...
...
@@ -208,6 +208,14 @@
* LCD BUZZ
*/
#define HAS_LCD_BUZZ (defined(ULTRALCD) || (defined(BEEPER) && BEEPER >= 0) || defined(LCD_USE_I2C_BUZZER))
/**
* SPLASH_SCREEN_DURATION for no DOGLCD display
*/
#ifndef DOGLCD
#undef SPLASH_SCREEN_DURATION
#define SPLASH_SCREEN_DURATION 500
#endif
#else // CONFIGURATION_LCD
...
...
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