|
@@ -334,7 +334,21 @@ static void lcd_implementation_status_screen()
|
334
|
334
|
// Status line
|
335
|
335
|
u8g.setFont(FONT_STATUSMENU);
|
336
|
336
|
u8g.setPrintPos(0,61);
|
337
|
|
- u8g.print(lcd_status_message);
|
|
337
|
+ #ifndef FILAMENT_LCD_DISPLAY
|
|
338
|
+ u8g.print(lcd_status_message);
|
|
339
|
+ #else
|
|
340
|
+ if(message_millis+5000>millis()){ //Display both Status message line and Filament display on the last line
|
|
341
|
+ u8g.print(lcd_status_message);
|
|
342
|
+ }
|
|
343
|
+ else
|
|
344
|
+ {
|
|
345
|
+ lcd_printPGM(PSTR("dia:"));
|
|
346
|
+ u8g.print(ftostr12ns(filament_width_meas));
|
|
347
|
+ lcd_printPGM(PSTR(" factor:"));
|
|
348
|
+ u8g.print(itostr3(extrudemultiply));
|
|
349
|
+ u8g.print('%');
|
|
350
|
+ }
|
|
351
|
+ #endif
|
338
|
352
|
|
339
|
353
|
}
|
340
|
354
|
|