CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use blink to show more info on LCD (#12256)

Browse Source
This commit is contained in:
MasterPIC 2018-11-01 21:56:12 +01:00 committed by Scott Lahteine
parent eb5600acd2
commit 6e041b9c61
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Marlin/src/lcd/HD44780/ultralcd_impl_HD44780.cpp
View File

@ -848,19 +848,38 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
lcd_put_u8str(itostr3(feedrate_percentage)); lcd_put_u8str(itostr3(feedrate_percentage));
lcd_put_wchar('%'); lcd_put_wchar('%');
#if LCD_WIDTH >= 20 && HAS_PRINT_PROGRESS
lcd_moveto(7, 2);
_draw_print_progress();
#endif
char buffer[14]; char buffer[14];
duration_t elapsed = print_job_timer.duration(); duration_t elapsed = print_job_timer.duration();
uint8_t len = elapsed.toDigital(buffer); const uint8_t len = elapsed.toDigital(buffer),
timepos = LCD_WIDTH - len - 1;
lcd_moveto(LCD_WIDTH - len - 1, 2); lcd_moveto(timepos, 2);
lcd_put_wchar(LCD_CLOCK_CHAR); lcd_put_wchar(LCD_CLOCK_CHAR);
lcd_put_u8str(buffer); lcd_put_u8str(buffer);
#if LCD_WIDTH >= 20
lcd_moveto(timepos - 7, 2);
#if HAS_PRINT_PROGRESS
_draw_print_progress();
#else
#if HAS_FAN0
char c;
int per;
if (blink) {
c = 'F';
per = ((int(fan_speed[0]) + 1) * 100) / 256;
}
else
#endif
{
c = 'E';
per = planner.flow_percentage[0];
}
lcd_put_wchar(c);
lcd_put_u8str(itostr3(per));
lcd_put_wchar('%');
#endif
#endif
#endif // LCD_HEIGHT > 3 #endif // LCD_HEIGHT > 3
// ========= Last Line ======== // ========= Last Line ========

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

@ -282,7 +282,7 @@ void lcd_impl_status_screen_0() {
#if HAS_FAN0 #if HAS_FAN0
if (PAGE_CONTAINS(STATUS_SCREEN_FAN_TEXT_Y - 7, STATUS_SCREEN_FAN_TEXT_Y)) { if (PAGE_CONTAINS(STATUS_SCREEN_FAN_TEXT_Y - 7, STATUS_SCREEN_FAN_TEXT_Y)) {
// Fan // Fan
const uint16_t per = (((uint16_t)fan_speed[0] + 1) * 100) / 256; const int per = ((int(fan_speed[0]) + 1) * 100) / 256;
if (per) { if (per) {
lcd_moveto(STATUS_SCREEN_FAN_TEXT_X, STATUS_SCREEN_FAN_TEXT_Y); lcd_moveto(STATUS_SCREEN_FAN_TEXT_X, STATUS_SCREEN_FAN_TEXT_Y);
lcd_put_u8str(itostr3(per)); lcd_put_u8str(itostr3(per));