Browse Source

Make BOOTSCREEN_TIMEOUT generally available

Scott Lahteine 4 years ago
parent
commit
0f39386d9b
3 changed files with 7 additions and 4 deletions
  1. 4
    1
      Marlin/Configuration_adv.h
  2. 0
    3
      Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
  3. 3
    0
      Marlin/src/lcd/ultralcd.h

+ 4
- 1
Marlin/Configuration_adv.h View File

@@ -992,6 +992,10 @@
992 992
 // Show the E position (filament used) during printing
993 993
 //#define LCD_SHOW_E_TOTAL
994 994
 
995
+#if ENABLED(SHOW_BOOTSCREEN)
996
+  #define BOOTSCREEN_TIMEOUT 4000        // (ms) Total Duration to display the boot screen(s)
997
+#endif
998
+
995 999
 #if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
996 1000
   //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
997 1001
   //#define SHOW_REMAINING_TIME          // Display estimated time to completion
@@ -1292,7 +1296,6 @@
1292 1296
   //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS  // Fix Rx overrun situation (Currently only for AVR)
1293 1297
 
1294 1298
   #define DGUS_UPDATE_INTERVAL_MS  500    // (ms) Interval between automatic screen updates
1295
-  #define BOOTSCREEN_TIMEOUT      3000    // (ms) Duration to display the boot screen
1296 1299
 
1297 1300
   #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
1298 1301
     #define DGUS_PRINT_FILENAME           // Display the filename during printing

+ 0
- 3
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp View File

@@ -219,9 +219,6 @@ bool MarlinUI::detected() { return true; }
219 219
 
220 220
   // Show the Marlin bootscreen, with the u8g loop and delays
221 221
   void MarlinUI::show_marlin_bootscreen() {
222
-    #ifndef BOOTSCREEN_TIMEOUT
223
-      #define BOOTSCREEN_TIMEOUT 2500
224
-    #endif
225 222
     constexpr uint8_t pages = two_part ? 2 : 1;
226 223
     for (uint8_t q = pages; q--;) {
227 224
       draw_marlin_bootscreen(q == 0);

+ 3
- 0
Marlin/src/lcd/ultralcd.h View File

@@ -345,6 +345,9 @@ public:
345 345
       #endif
346 346
 
347 347
       #if ENABLED(SHOW_BOOTSCREEN)
348
+        #ifndef BOOTSCREEN_TIMEOUT
349
+          #define BOOTSCREEN_TIMEOUT 2500
350
+        #endif
348 351
         static void draw_marlin_bootscreen(const bool line2=false);
349 352
         static void show_marlin_bootscreen();
350 353
         static void show_bootscreen();

Loading…
Cancel
Save