bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Make sure FAN_ANIM_FRAMES is defined

Browse Source
This commit is contained in:
Scott Lahteine 2018-05-25 05:28:19 -05:00
parent e2db509d58
commit d74e333c0f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/config/examples/Creality/CR-10S/_Statusscreen.h
View File

@ -36,7 +36,10 @@
#define STATUS_SCREEN_BED_TEXT_X (HOTENDS > 1 ? 81 : 73) #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_X (FAN_ANIM_FRAMES == 3 ? 103 : 105)
#define STATUS_SCREEN_FAN_TEXT_Y (FAN_ANIM_FRAMES > 2 ? 28 : 27) #define STATUS_SCREEN_FAN_TEXT_Y (FAN_ANIM_FRAMES > 2 ? 28 : 27)

5
Marlin/src/lcd/dogm/dogm_bitmaps.h
View File

@ -138,6 +138,7 @@
#else // !CUSTOM_STATUS_SCREEN_IMAGE #else // !CUSTOM_STATUS_SCREEN_IMAGE
// Can also be overridden in Configuration.h
// If you can afford it, try the 3-frame fan animation! // If you can afford it, try the 3-frame fan animation!
#ifndef FAN_ANIM_FRAMES #ifndef FAN_ANIM_FRAMES
#define FAN_ANIM_FRAMES 2 #define FAN_ANIM_FRAMES 2
@ -1149,7 +1150,9 @@
#define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH)) #define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH))
#endif #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." #error "Only 3 fan animation frames currently supported."
#endif #endif
#ifndef STATUS_SCREEN_X #ifndef STATUS_SCREEN_X