Make lcd_bootscreen common to both

2017-07-02 00:35:41 -05:00
parent 859248433f
commit ae5923a3d0
4 changed files with 65 additions and 46 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -13034,11 +13034,16 @@ void setup() {
  #endif

  lcd_init();
+
  #if ENABLED(SHOW_BOOTSCREEN)
-    #if ENABLED(DOGLCD)
-      safe_delay(BOOTSCREEN_TIMEOUT);
+    #if ENABLED(DOGLCD)                           // On DOGM the first bootscreen is already drawn
+      #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
+        safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);    // Custom boot screen pause
+        lcd_bootscreen();                         // Show Marlin boot screen
+      #endif
+      safe_delay(BOOTSCREEN_TIMEOUT);             // Pause
    #elif ENABLED(ULTRA_LCD)
-      bootscreen();
+      lcd_bootscreen();
      #if DISABLED(SDSUPPORT)
        lcd_init();
      #endif