bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Combine Travis CI option-setting commands (#12474)

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-18 19:58:02 -06:00
committed by GitHub
parent 9d13f07d09
commit 826d570162
20 changed files with 118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -37,6 +37,12 @@
#include "../../module/motion.h"
#include "../../module/temperature.h"
#if ENABLED(FILAMENT_LCD_DISPLAY)
#include "../../feature/filwidth.h"
#include "../../module/planner.h"
#include "../../gcode/parser.h"
#endif
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
#endif
@ -477,9 +483,7 @@ void MarlinUI::draw_status_screen() {
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
// Alternate Status message and Filament display
if (PENDING(millis(), next_filament_display))
draw_status_message(blink);
else {
if (ELAPSED(millis(), next_filament_display)) {
lcd_put_u8str_P(PSTR(LCD_STR_FILAM_DIA));
lcd_put_wchar(':');
lcd_put_u8str(wstring);
@ -488,9 +492,9 @@ void MarlinUI::draw_status_screen() {
lcd_put_u8str(mstring);
lcd_put_wchar('%');
}
#else
draw_status_message(blink);
else
#endif
draw_status_message(blink);
}
}