|
@@ -118,14 +118,16 @@
|
118
|
118
|
|
119
|
119
|
#endif
|
120
|
120
|
|
121
|
|
-#endif
|
|
121
|
+ #ifndef START_BMP_BYTEWIDTH
|
|
122
|
+ #define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8)
|
|
123
|
+ #endif
|
|
124
|
+ #ifndef START_BMPHEIGHT
|
|
125
|
+ #define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH))
|
|
126
|
+ #endif
|
122
|
127
|
|
|
128
|
+ static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
|
123
|
129
|
|
124
|
|
-// Here comes a compile-time operation to match the extruder symbols
|
125
|
|
-// on the info screen to the set number of extruders in configuration.h
|
126
|
|
-//
|
127
|
|
-// When only one extruder is selected, the "1" on the symbol will not
|
128
|
|
-// be displayed.
|
|
130
|
+#endif
|
129
|
131
|
|
130
|
132
|
#if ENABLED(CUSTOM_STATUS_SCREEN_IMAGE)
|
131
|
133
|
|
|
@@ -601,13 +603,6 @@
|
601
|
603
|
|
602
|
604
|
#endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
|
603
|
605
|
|
604
|
|
-#ifndef START_BMP_BYTEWIDTH
|
605
|
|
- #define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8)
|
606
|
|
-#endif
|
607
|
|
-#ifndef START_BMPHEIGHT
|
608
|
|
- #define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH))
|
609
|
|
-#endif
|
610
|
|
-
|
611
|
606
|
#ifndef CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH
|
612
|
607
|
#define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
|
613
|
608
|
#endif
|
|
@@ -645,11 +640,6 @@
|
645
|
640
|
#error "Only 4 fan animation frames currently supported."
|
646
|
641
|
#endif
|
647
|
642
|
|
648
|
|
-//
|
649
|
|
-// Make sure data size matches
|
650
|
|
-//
|
651
|
|
-static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
|
652
|
|
-
|
653
|
643
|
#define BMP_SIZE (STATUS_BMP_BYTEWIDTH) * (STATUS_SCREENHEIGHT)
|
654
|
644
|
static_assert(sizeof(status_screen0_bmp) == BMP_SIZE, "Status header (status_screen0_bmp) dimensions don't match data.");
|
655
|
645
|
#if FAN_ANIM_FRAMES > 1
|