josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #873 from PavelSindler/MK3_for_merging 

status screen update
This commit is contained in:
PavelSindler 2018-06-25 17:56:53 +02:00 committed by GitHub
parent 20f98d487a 81c0c01825
commit 3674673faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/ultralcd_implementation_hitachi_HD44780.h
View File

@ -699,7 +699,7 @@ static inline void lcd_print_percent_done() {
{ {
lcd_printPGM(PSTR("---")); lcd_printPGM(PSTR("---"));
} }
lcd.print('%'); lcd_printPGM(PSTR("% "));
} }
static inline void lcd_print_time() { static inline void lcd_print_time() {
@ -718,8 +718,14 @@ static inline void lcd_print_time() {
lcd.print(itostr2(print_t/60)); lcd.print(itostr2(print_t/60));
lcd.print(':'); lcd.print(':');
lcd.print(itostr2(print_t%60)); lcd.print(itostr2(print_t%60));
(print_time_remaining_normal != PRINT_TIME_REMAINING_INIT) ? lcd.print('R') : lcd.print(' '); if (print_time_remaining_normal != PRINT_TIME_REMAINING_INIT)
(feedmultiply == 100) ? lcd.print(' ') : lcd.print('?'); {
lcd.print('R');
(feedmultiply == 100) ? lcd.print(' ') : lcd.print('?');
}
else {
lcd_printPGM(PSTR(" "));
}
}else{ }else{
lcd_printPGM(PSTR("--:-- ")); lcd_printPGM(PSTR("--:-- "));
} }