MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

DOGM bootscreen cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2019-03-07 18:35:06 -06:00
parent 2aa35e95af
commit 5d2c5877f7
3 changed files with 96 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/inc/Conditionals_LCD.h
View File

@ -338,13 +338,6 @@
#endif #endif
#endif #endif
// Boot screens
#if !HAS_SPI_LCD
#undef SHOW_BOOTSCREEN
#elif !defined(BOOTSCREEN_TIMEOUT)
#define BOOTSCREEN_TIMEOUT 2500
#endif
/** /**
* Extruders have some combination of stepper motors and hotends * Extruders have some combination of stepper motors and hotends
* so we separate these concepts into the defines: * so we separate these concepts into the defines:

38
Marlin/src/lcd/dogm/dogm_Bootscreen.h
View File

@ -29,21 +29,22 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if ENABLED(SHOW_BOOTSCREEN) //#define START_BMPHIGH // Costs 399 bytes more flash
//#define START_BMPHIGH // Costs 399 bytes more flash #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
#include "../../../_Bootscreen.h" #include "../../../_Bootscreen.h"
#ifndef CUSTOM_BOOTSCREEN_TIMEOUT #ifndef CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH
#define CUSTOM_BOOTSCREEN_TIMEOUT 2500 #define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
#endif
#ifndef CUSTOM_BOOTSCREEN_BMPHEIGHT
#define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH))
#endif #endif
#endif #endif
#if ENABLED(START_BMPHIGH) #if ENABLED(START_BMPHIGH)
#define START_BMPWIDTH 112 #define START_BMPWIDTH 112
@ -88,7 +89,7 @@
B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000 B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
}; };
#else #else
#define START_BMPWIDTH 56 #define START_BMPWIDTH 56
@ -114,22 +115,13 @@
B00011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111000 B00011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111000
}; };
#endif #endif
#ifndef START_BMP_BYTEWIDTH #ifndef START_BMP_BYTEWIDTH
#define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8) #define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8)
#endif #endif
#ifndef START_BMPHEIGHT #ifndef START_BMPHEIGHT
#define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH)) #define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH))
#endif
static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
#endif #endif
#ifndef CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
#define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
#endif
#ifndef CUSTOM_BOOTSCREEN_BMPHEIGHT
#define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH))
#endif

11
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View File

@ -41,7 +41,10 @@
#include "ultralcd_DOGM.h" #include "ultralcd_DOGM.h"
#include "u8g_fontutf8.h" #include "u8g_fontutf8.h"
#include "dogm_Bootscreen.h"
#if ENABLED(SHOW_BOOTSCREEN)
#include "dogm_Bootscreen.h"
#endif
#include "../lcdprint.h" #include "../lcdprint.h"
#include "../fontutils.h" #include "../fontutils.h"
@ -138,6 +141,9 @@ void MarlinUI::set_font(const MarlinFont font_nr) {
#else #else
draw_custom_bootscreen(custom_start_bmp); draw_custom_bootscreen(custom_start_bmp);
#endif #endif
#ifndef CUSTOM_BOOTSCREEN_TIMEOUT
#define CUSTOM_BOOTSCREEN_TIMEOUT 2500
#endif
safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT); safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);
} }
@ -173,6 +179,9 @@ void MarlinUI::set_font(const MarlinFont font_nr) {
u8g.drawStr(txt2X, height - (MENU_FONT_HEIGHT) * 1 / 2, STRING_SPLASH_LINE2); u8g.drawStr(txt2X, height - (MENU_FONT_HEIGHT) * 1 / 2, STRING_SPLASH_LINE2);
#endif #endif
} while (u8g.nextPage()); } while (u8g.nextPage());
#ifndef BOOTSCREEN_TIMEOUT
#define BOOTSCREEN_TIMEOUT 2500
#endif
safe_delay(BOOTSCREEN_TIMEOUT); safe_delay(BOOTSCREEN_TIMEOUT);
} }