SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7211 from thinkyhead/bf_lcd_bootscreen

Browse source 
Use lcd_bootscreen for both
This commit is contained in:
Scott Lahteine 2017-07-02 02:11:07 -05:00 committed by GitHub
commit 395a9f59ac
5 changed files with 66 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View file

@ -13034,11 +13034,16 @@ void setup() {
#endif #endif
lcd_init(); lcd_init();
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD) // On DOGM the first bootscreen is already drawn
safe_delay(BOOTSCREEN_TIMEOUT); #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT); // Custom boot screen pause
lcd_bootscreen(); // Show Marlin boot screen
#endif
safe_delay(BOOTSCREEN_TIMEOUT); // Pause
#elif ENABLED(ULTRA_LCD) #elif ENABLED(ULTRA_LCD)
bootscreen(); lcd_bootscreen();
#if DISABLED(SDSUPPORT) #if DISABLED(SDSUPPORT)
lcd_init(); lcd_init();
#endif #endif

2
Marlin/gcode.h
View file

@ -124,7 +124,7 @@ public:
if (debug) { if (debug) {
SERIAL_ECHOPAIR("Set bit ", (int)PARAM_BIT(ind)); SERIAL_ECHOPAIR("Set bit ", (int)PARAM_BIT(ind));
SERIAL_ECHOPAIR(" of index ", (int)PARAM_IND(ind)); SERIAL_ECHOPAIR(" of index ", (int)PARAM_IND(ind));
SERIAL_ECHOLNPAIR(" | param = ", hex_address((void*)param[ind])); SERIAL_ECHOLNPAIR(" | param = ", (int)param[ind]);
} }
#endif #endif
} }

6
Marlin/ultralcd.h
View file

@ -64,8 +64,10 @@
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
extern uint16_t lcd_contrast; extern uint16_t lcd_contrast;
void set_lcd_contrast(const uint16_t value); void set_lcd_contrast(const uint16_t value);
#elif ENABLED(SHOW_BOOTSCREEN) #endif
void bootscreen();
#if ENABLED(SHOW_BOOTSCREEN)
void lcd_bootscreen();
#endif #endif
#define LCD_UPDATE_INTERVAL 100 #define LCD_UPDATE_INTERVAL 100

90
Marlin/ultralcd_impl_DOGM.h
View file

@ -256,6 +256,55 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
while (n && (c = pgm_read_byte(str))) n -= charset_mapper(c), ++str; while (n && (c = pgm_read_byte(str))) n -= charset_mapper(c), ++str;
} }
#if ENABLED(SHOW_BOOTSCREEN)
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
void lcd_custom_bootscreen() {
u8g.firstPage();
do {
u8g.drawBitmapP(
(128 - (CUSTOM_BOOTSCREEN_BMPWIDTH)) /2,
( 64 - (CUSTOM_BOOTSCREEN_BMPHEIGHT)) /2,
CEILING(CUSTOM_BOOTSCREEN_BMPWIDTH, 8), CUSTOM_BOOTSCREEN_BMPHEIGHT, custom_start_bmp);
} while (u8g.nextPage());
}
#endif // SHOW_CUSTOM_BOOTSCREEN
void lcd_bootscreen() {
static bool show_bootscreen = true;
if (show_bootscreen) {
show_bootscreen = false;
#if ENABLED(START_BMPHIGH)
constexpr uint8_t offy = 0;
#else
constexpr uint8_t offy = DOG_CHAR_HEIGHT;
#endif
const uint8_t offx = (u8g.getWidth() - (START_BMPWIDTH)) / 2,
txt1X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE1) - 1) * (DOG_CHAR_WIDTH)) / 2;
u8g.firstPage();
do {
u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
lcd_setFont(FONT_MENU);
#ifndef STRING_SPLASH_LINE2
u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT), STRING_SPLASH_LINE1);
#else
const uint8_t txt2X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE2) - 1) * (DOG_CHAR_WIDTH)) / 2;
u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 3 / 2, STRING_SPLASH_LINE1);
u8g.drawStr(txt2X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 1 / 2, STRING_SPLASH_LINE2);
#endif
} while (u8g.nextPage());
}
}
#endif // SHOW_BOOTSCREEN
// Initialize or re-initialize the LCD // Initialize or re-initialize the LCD
static void lcd_implementation_init() { static void lcd_implementation_init() {
@ -284,49 +333,12 @@ static void lcd_implementation_init() {
#endif #endif
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
static bool show_bootscreen = true;
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
if (show_bootscreen) { lcd_custom_bootscreen();
u8g.firstPage();
do {
u8g.drawBitmapP(
(128 - (CUSTOM_BOOTSCREEN_BMPWIDTH)) /2,
( 64 - (CUSTOM_BOOTSCREEN_BMPHEIGHT)) /2,
CEILING(CUSTOM_BOOTSCREEN_BMPWIDTH, 8), CUSTOM_BOOTSCREEN_BMPHEIGHT, custom_start_bmp);
} while (u8g.nextPage());
safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);
}
#endif // SHOW_CUSTOM_BOOTSCREEN
const uint8_t offx = (u8g.getWidth() - (START_BMPWIDTH)) / 2;
#if ENABLED(START_BMPHIGH)
constexpr uint8_t offy = 0;
#else #else
constexpr uint8_t offy = DOG_CHAR_HEIGHT; lcd_bootscreen();
#endif #endif
const uint8_t txt1X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE1) - 1) * (DOG_CHAR_WIDTH)) / 2;
if (show_bootscreen) {
u8g.firstPage();
do {
u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
lcd_setFont(FONT_MENU);
#ifndef STRING_SPLASH_LINE2
u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT), STRING_SPLASH_LINE1);
#else
const uint8_t txt2X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE2) - 1) * (DOG_CHAR_WIDTH)) / 2;
u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 3 / 2, STRING_SPLASH_LINE1);
u8g.drawStr(txt2X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 1 / 2, STRING_SPLASH_LINE2);
#endif #endif
} while (u8g.nextPage());
}
show_bootscreen = false;
#endif // SHOW_BOOTSCREEN
} }
// The kill screen is displayed for unrecoverable conditions // The kill screen is displayed for unrecoverable conditions

2
Marlin/ultralcd_impl_HD44780.h
View file

@ -443,7 +443,7 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
lcd.setCursor(indent, 2); lcd.write('\x02'); lcd_printPGM(PSTR( "------" )); lcd.write('\x03'); lcd.setCursor(indent, 2); lcd.write('\x02'); lcd_printPGM(PSTR( "------" )); lcd.write('\x03');
} }
void bootscreen() { void lcd_bootscreen() {
const static PROGMEM byte corner[4][8] = { { const static PROGMEM byte corner[4][8] = { {
B00000, B00000,
B00000, B00000,