From 4ae9afcc56b4745bf6a30d4b8dd05ac8d4808877 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 17 Feb 2018 00:49:18 -0600
Subject: [PATCH] Fix compile error with SHOW_BOOTSCREEN disabled

Fix #9530
Fix #9524
---
 Marlin/dogm_bitmaps.h | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/Marlin/dogm_bitmaps.h b/Marlin/dogm_bitmaps.h
index d9be701d1..c3833bdde 100644
--- a/Marlin/dogm_bitmaps.h
+++ b/Marlin/dogm_bitmaps.h
@@ -21,7 +21,7 @@
  */
 
 /**
- * Standard Marlin Boot Screen bitmaps
+ * Standard Marlin Boot and Status Screen bitmaps
  *
  * Use the Marlin Bitmap Converter to make your own:
  * http://marlinfw.org/tools/u8glib/converter.html
@@ -116,15 +116,17 @@
 
   #endif
 
+  #ifndef START_BMP_BYTEWIDTH
+    #define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8)
+  #endif
+  #ifndef START_BMPHEIGHT
+    #define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH))
+  #endif
+
+  static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
+
 #endif
 
-
-// Here comes a compile-time operation to match the extruder symbols
-// on the info screen to the set number of extruders in configuration.h
-//
-// When only one extruder is selected, the "1" on the symbol will not
-// be displayed.
-
 #if ENABLED(CUSTOM_STATUS_SCREEN_IMAGE)
 
   // This file must define STATUS_SCREENWIDTH and status_screen{0, 1}_bmp.
@@ -599,13 +601,6 @@
 
 #endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
 
-#ifndef START_BMP_BYTEWIDTH
-  #define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8)
-#endif
-#ifndef START_BMPHEIGHT
-  #define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH))
-#endif
-
 #ifndef CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH
   #define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
 #endif
@@ -643,11 +638,6 @@
   #error "Only 4 fan animation frames currently supported."
 #endif
 
-//
-// Make sure data size matches
-//
-static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
-
 #define BMP_SIZE (STATUS_BMP_BYTEWIDTH) * (STATUS_SCREENHEIGHT)
 static_assert(sizeof(status_screen0_bmp) == BMP_SIZE, "Status header (status_screen0_bmp) dimensions don't match data.");
 #if FAN_ANIM_FRAMES > 1