|
|
@ -118,14 +118,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#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.");
|
|
|
|
|
|
|
|
|
|
|
|
// Here comes a compile-time operation to match the extruder symbols
|
|
|
|
#endif
|
|
|
|
// 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)
|
|
|
|
#if ENABLED(CUSTOM_STATUS_SCREEN_IMAGE)
|
|
|
|
|
|
|
|
|
|
|
@ -601,13 +603,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
#endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
|
|
|
|
#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
|
|
|
|
#ifndef CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH
|
|
|
|
#define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
|
|
|
|
#define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -645,11 +640,6 @@
|
|
|
|
#error "Only 4 fan animation frames currently supported."
|
|
|
|
#error "Only 4 fan animation frames currently supported."
|
|
|
|
#endif
|
|
|
|
#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)
|
|
|
|
#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.");
|
|
|
|
static_assert(sizeof(status_screen0_bmp) == BMP_SIZE, "Status header (status_screen0_bmp) dimensions don't match data.");
|
|
|
|
#if FAN_ANIM_FRAMES > 1
|
|
|
|
#if FAN_ANIM_FRAMES > 1
|
|
|
|