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

Allow LCD_SET_PROGRESS_MANUALLY without SDSUPPORT

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-17 08:07:32 -06:00
parent c67cefd913
commit a1f0d9d349
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/ultralcd_impl_DOGM.h
View File

@ -518,7 +518,6 @@ static void lcd_implementation_status_screen() {
// entry to the status screen. Nozzle, bed, and // entry to the status screen. Nozzle, bed, and
// fan outline bits don't change. // fan outline bits don't change.
// //
if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) { if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) {
u8g.drawBitmapP( u8g.drawBitmapP(
@ -567,11 +566,9 @@ static void lcd_implementation_status_screen() {
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// //
// SD Card Symbol // SD Card Symbol
// //
if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) { if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
// Upper box // Upper box
u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47) u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47)
@ -582,11 +579,12 @@ static void lcd_implementation_status_screen() {
// Corner pixel // Corner pixel
u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION)); // 43 (or 42) u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION)); // 43 (or 42)
} }
#endif // SDSUPPORT
#if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY)
// //
// Progress bar frame // Progress bar frame
// //
#define PROGRESS_BAR_X 54 #define PROGRESS_BAR_X 54
#define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X) #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
@ -637,7 +635,6 @@ static void lcd_implementation_status_screen() {
#endif #endif
if (PAGE_CONTAINS(41, 48)) { if (PAGE_CONTAINS(41, 48)) {
char buffer[10]; char buffer[10];
duration_t elapsed = print_job_timer.duration(); duration_t elapsed = print_job_timer.duration();
bool has_days = (elapsed.value >= 60*60*24L); bool has_days = (elapsed.value >= 60*60*24L);
@ -646,7 +643,7 @@ static void lcd_implementation_status_screen() {
lcd_print(buffer); lcd_print(buffer);
} }
#endif #endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY
// //
// XYZ Coordinates // XYZ Coordinates