3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1102 from MRprusa3d/PFW-525

Browse source 
Time info
This commit is contained in:
PavelSindler 2018-09-04 15:20:14 +02:00 committed by GitHub
commit ae823c3c43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Firmware/ultralcd.cpp
View file

@ -597,8 +597,15 @@ void lcdui_print_time(void)
int chars = 0; int chars = 0;
if ((PRINTER_ACTIVE) && ((print_time_remaining_normal != PRINT_TIME_REMAINING_INIT) || (starttime != 0))) if ((PRINTER_ACTIVE) && ((print_time_remaining_normal != PRINT_TIME_REMAINING_INIT) || (starttime != 0)))
{ {
char suff = (print_time_remaining_normal == PRINT_TIME_REMAINING_INIT)?' ':'R'; char suff = ' ';
chars = lcd_printf_P(_N("%c%02u:%02u%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff); char suff_doubt = ' ';
if (print_time_remaining_normal != PRINT_TIME_REMAINING_INIT)
{
suff = 'R';
if (feedmultiply != 100)
suff_doubt = '?';
}
chars = lcd_printf_P(_N("%c%02u:%02u%c%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff, suff_doubt);
} }
else else
chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]); chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]);