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

Make BOOTSCREEN_TIMEOUT generally available

Browse Source
This commit is contained in:
Scott Lahteine 2020-03-09 15:03:57 -05:00
parent 7674befa47
commit 0f39386d9b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Configuration_adv.h
View File

@ -992,6 +992,10 @@
// Show the E position (filament used) during printing // Show the E position (filament used) during printing
//#define LCD_SHOW_E_TOTAL //#define LCD_SHOW_E_TOTAL
#if ENABLED(SHOW_BOOTSCREEN)
#define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s)
#endif
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS #if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
//#define SHOW_REMAINING_TIME // Display estimated time to completion //#define SHOW_REMAINING_TIME // Display estimated time to completion
@ -1292,7 +1296,6 @@
//#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS // Fix Rx overrun situation (Currently only for AVR) //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS // Fix Rx overrun situation (Currently only for AVR)
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates #define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
#define BOOTSCREEN_TIMEOUT 3000 // (ms) Duration to display the boot screen
#if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY) #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
#define DGUS_PRINT_FILENAME // Display the filename during printing #define DGUS_PRINT_FILENAME // Display the filename during printing

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

@ -219,9 +219,6 @@ bool MarlinUI::detected() { return true; }
// Show the Marlin bootscreen, with the u8g loop and delays // Show the Marlin bootscreen, with the u8g loop and delays
void MarlinUI::show_marlin_bootscreen() { void MarlinUI::show_marlin_bootscreen() {
#ifndef BOOTSCREEN_TIMEOUT
#define BOOTSCREEN_TIMEOUT 2500
#endif
constexpr uint8_t pages = two_part ? 2 : 1; constexpr uint8_t pages = two_part ? 2 : 1;
for (uint8_t q = pages; q--;) { for (uint8_t q = pages; q--;) {
draw_marlin_bootscreen(q == 0); draw_marlin_bootscreen(q == 0);

3
Marlin/src/lcd/ultralcd.h
View File

@ -345,6 +345,9 @@ public:
#endif #endif
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
#ifndef BOOTSCREEN_TIMEOUT
#define BOOTSCREEN_TIMEOUT 2500
#endif
static void draw_marlin_bootscreen(const bool line2=false); static void draw_marlin_bootscreen(const bool line2=false);
static void show_marlin_bootscreen(); static void show_marlin_bootscreen();
static void show_bootscreen(); static void show_bootscreen();