|
@@ -144,10 +144,16 @@ bool MarlinUI::detected() { return true; }
|
144
|
144
|
constexpr millis_t d = 0;
|
145
|
145
|
constexpr uint8_t f = 0;
|
146
|
146
|
#else
|
147
|
|
- constexpr millis_t d = CUSTOM_BOOTSCREEN_FRAME_TIME;
|
|
147
|
+ #if DISABLED(CUSTOM_BOOTSCREEN_ANIMATED_FRAME_TIME)
|
|
148
|
+ constexpr millis_t d = CUSTOM_BOOTSCREEN_FRAME_TIME;
|
|
149
|
+ #endif
|
148
|
150
|
LOOP_L_N(f, COUNT(custom_bootscreen_animation))
|
149
|
151
|
#endif
|
150
|
152
|
{
|
|
153
|
+ #if ENABLED(CUSTOM_BOOTSCREEN_ANIMATED_FRAME_TIME)
|
|
154
|
+ const uint8_t fr = _MIN(f, COUNT(custom_bootscreen_frame_time) - 1);
|
|
155
|
+ const millis_t d = custom_bootscreen_frame_time[fr];
|
|
156
|
+ #endif
|
151
|
157
|
u8g.firstPage();
|
152
|
158
|
do { draw_custom_bootscreen(f); } while (u8g.nextPage());
|
153
|
159
|
if (d) safe_delay(d);
|
|
@@ -156,7 +162,9 @@ bool MarlinUI::detected() { return true; }
|
156
|
162
|
#ifndef CUSTOM_BOOTSCREEN_TIMEOUT
|
157
|
163
|
#define CUSTOM_BOOTSCREEN_TIMEOUT 2500
|
158
|
164
|
#endif
|
159
|
|
- safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);
|
|
165
|
+ #if CUSTOM_BOOTSCREEN_TIMEOUT
|
|
166
|
+ safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);
|
|
167
|
+ #endif
|
160
|
168
|
}
|
161
|
169
|
#endif // SHOW_CUSTOM_BOOTSCREEN
|
162
|
170
|
|