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

Merge pull request #2402 from leptun/MK3_sheet_on_status_screen

Browse Source 
Do not show sheet on status screen if less than 2 are initialized
This commit is contained in:
DRracer 2020-01-08 14:42:29 +01:00 committed by GitHub
commit e15d5e21f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Firmware/ultralcd.cpp
View File

@ -622,22 +622,25 @@ void lcdui_print_feedrate(void)
// Print percent done in form "USB---%", " SD---%", " ---%" (7 chars total) // Print percent done in form "USB---%", " SD---%", " ---%" (7 chars total)
void lcdui_print_percent_done(void) void lcdui_print_percent_done(void)
{ {
char sheet[8];
const char* src = is_usb_printing?_N("USB"):(IS_SD_PRINTING?_N(" SD"):_N(" ")); const char* src = is_usb_printing?_N("USB"):(IS_SD_PRINTING?_N(" SD"):_N(" "));
char per[4]; char per[4];
bool num = IS_SD_PRINTING || (PRINTER_ACTIVE && (print_percent_done_normal != PRINT_PERCENT_DONE_INIT)); bool num = IS_SD_PRINTING || (PRINTER_ACTIVE && (print_percent_done_normal != PRINT_PERCENT_DONE_INIT));
if (!num || heating_status) // either not printing or heating if (!num || heating_status) // either not printing or heating
{ {
eeprom_read_block(sheet, EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].name, 7); const int8_t sheetNR = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet));
sheet[7] = '\0'; const int8_t nextSheet = eeprom_next_initialized_sheet(sheetNR);
lcd_printf_P(PSTR("%s"),sheet); if ((nextSheet >= 0) && (sheetNR != nextSheet))
}
else
{ {
char sheet[8];
eeprom_read_block(sheet, EEPROM_Sheets_base->s[sheetNR].name, 7);
sheet[7] = '\0';
lcd_printf_P(PSTR("%-7s"),sheet);
return; //do not also print the percentage
}
}
sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done()); sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done());
lcd_printf_P(_N("%3S%3s%%"), src, per); lcd_printf_P(_N("%3S%3s%%"), src, per);
} }
}
// Print extruder status (5 chars total) // Print extruder status (5 chars total)
void lcdui_print_extruder(void) void lcdui_print_extruder(void)