diff --git a/Marlin/dogm_bitmaps.h b/Marlin/dogm_bitmaps.h index f75aa41c9..42b94b7db 100644 --- a/Marlin/dogm_bitmaps.h +++ b/Marlin/dogm_bitmaps.h @@ -137,6 +137,7 @@ #else // !CUSTOM_STATUS_SCREEN_IMAGE + // Can also be overridden in Configuration.h // If you can afford it, try the 3-frame fan animation! #ifndef FAN_ANIM_FRAMES #define FAN_ANIM_FRAMES 2 @@ -1148,7 +1149,9 @@ #define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH)) #endif -#if FAN_ANIM_FRAMES > 3 +#ifndef FAN_ANIM_FRAMES + #define FAN_ANIM_FRAMES 2 +#elif FAN_ANIM_FRAMES > 3 #error "Only 3 fan animation frames currently supported." #endif #ifndef STATUS_SCREEN_X diff --git a/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h b/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h index c956a55a7..30264c6de 100644 --- a/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h +++ b/Marlin/example_configurations/Creality/CR-10S/_Statusscreen.h @@ -36,7 +36,10 @@ #define STATUS_SCREEN_BED_TEXT_X (HOTENDS > 1 ? 81 : 73) -#define FAN_ANIM_FRAMES 3 +// Can also be overridden in Configuration.h +#ifndef FAN_ANIM_FRAMES + #define FAN_ANIM_FRAMES 3 +#endif #define STATUS_SCREEN_FAN_TEXT_X (FAN_ANIM_FRAMES == 3 ? 103 : 105) #define STATUS_SCREEN_FAN_TEXT_Y (FAN_ANIM_FRAMES > 2 ? 28 : 27)