Browse Source

Make sure FAN_ANIM_FRAMES is defined

Scott Lahteine 7 years ago
parent
commit
d74e333c0f

+ 4
- 1
Marlin/src/config/examples/Creality/CR-10S/_Statusscreen.h View File

36
 
36
 
37
 #define STATUS_SCREEN_BED_TEXT_X (HOTENDS > 1 ? 81 : 73)
37
 #define STATUS_SCREEN_BED_TEXT_X (HOTENDS > 1 ? 81 : 73)
38
 
38
 
39
-#define FAN_ANIM_FRAMES 3
39
+// Can also be overridden in Configuration.h
40
+#ifndef FAN_ANIM_FRAMES
41
+  #define FAN_ANIM_FRAMES 3
42
+#endif
40
 #define STATUS_SCREEN_FAN_TEXT_X (FAN_ANIM_FRAMES == 3 ? 103 : 105)
43
 #define STATUS_SCREEN_FAN_TEXT_X (FAN_ANIM_FRAMES == 3 ? 103 : 105)
41
 #define STATUS_SCREEN_FAN_TEXT_Y (FAN_ANIM_FRAMES > 2 ? 28 : 27)
44
 #define STATUS_SCREEN_FAN_TEXT_Y (FAN_ANIM_FRAMES > 2 ? 28 : 27)
42
 
45
 

+ 4
- 1
Marlin/src/lcd/dogm/dogm_bitmaps.h View File

138
 
138
 
139
 #else // !CUSTOM_STATUS_SCREEN_IMAGE
139
 #else // !CUSTOM_STATUS_SCREEN_IMAGE
140
 
140
 
141
+  // Can also be overridden in Configuration.h
141
   // If you can afford it, try the 3-frame fan animation!
142
   // If you can afford it, try the 3-frame fan animation!
142
   #ifndef FAN_ANIM_FRAMES
143
   #ifndef FAN_ANIM_FRAMES
143
     #define FAN_ANIM_FRAMES 2
144
     #define FAN_ANIM_FRAMES 2
1149
   #define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH))
1150
   #define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH))
1150
 #endif
1151
 #endif
1151
 
1152
 
1152
-#if FAN_ANIM_FRAMES > 3
1153
+#ifndef FAN_ANIM_FRAMES
1154
+  #define FAN_ANIM_FRAMES 2
1155
+#elif FAN_ANIM_FRAMES > 3
1153
   #error "Only 3 fan animation frames currently supported."
1156
   #error "Only 3 fan animation frames currently supported."
1154
 #endif
1157
 #endif
1155
 #ifndef STATUS_SCREEN_X
1158
 #ifndef STATUS_SCREEN_X

Loading…
Cancel
Save