melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Animated boot followup

Browse Source
This commit is contained in:
Scott Lahteine 2021-01-02 18:40:52 -06:00
parent 66c69aef6a
commit 385152b3d2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/lcd/dogm/marlinui_DOGM.cpp
View File

@ -116,13 +116,16 @@ bool MarlinUI::detected() { return true; }
bottom = top + CUSTOM_BOOTSCREEN_BMPHEIGHT; bottom = top + CUSTOM_BOOTSCREEN_BMPHEIGHT;
#endif #endif
#if ENABLED(CUSTOM_BOOTSCREEN_ANIMATED)
const void * const frame_ptr = pgm_read_ptr(&custom_bootscreen_animation[frame]); const void * const frame_ptr = pgm_read_ptr(&custom_bootscreen_animation[frame]);
#if ENABLED(CUSTOM_BOOTSCREEN_TIME_PER_FRAME)
#if BOTH(CUSTOM_BOOTSCREEN_ANIMATED, CUSTOM_BOOTSCREEN_TIME_PER_FRAME)
const boot_frame_t * const frame_info = (boot_frame_t*)frame_ptr; const boot_frame_t * const frame_info = (boot_frame_t*)frame_ptr;
const u8g_pgm_uint8_t * const bmp = (u8g_pgm_uint8_t*)pgm_read_ptr(&frame_info->bitmap); const u8g_pgm_uint8_t * const bmp = (u8g_pgm_uint8_t*)pgm_read_ptr(&frame_info->bitmap);
#else #else
const u8g_pgm_uint8_t * const bmp = TERN(CUSTOM_BOOTSCREEN_ANIMATED, (u8g_pgm_uint8_t*)frame_ptr, custom_start_bmp); const u8g_pgm_uint8_t * const bmp = (u8g_pgm_uint8_t*)frame_ptr;
#endif
#else
const u8g_pgm_uint8_t * const bmp = custom_start_bmp;
#endif #endif
UNUSED(frame); UNUSED(frame);