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

Merge pull request #2573 from leptun/MK3_filecheck_progress_bar 

✨Progress bar for check_file()
This commit is contained in:
DRracer 2020-11-13 11:56:04 +01:00 committed by GitHub
parent 2103d2f588 807eddafb0
commit 04bb4b5dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Firmware/ultralcd.cpp
View File

@ -8781,22 +8781,35 @@ static void lcd_selftest_screen_step(int _row, int _col, int _state, const char
static bool check_file(const char* filename) { static bool check_file(const char* filename) {
if (farm_mode) return true; if (farm_mode) return true;
bool result = false;
uint32_t filesize;
card.openFile((char*)filename, true); card.openFile((char*)filename, true);
filesize = card.getFileSize(); bool result = false;
const uint32_t filesize = card.getFileSize();
uint32_t startPos = 0;
const uint16_t bytesToCheck = min(END_FILE_SECTION, filesize);
uint8_t blocksPrinted = 0;
if (filesize > END_FILE_SECTION) { if (filesize > END_FILE_SECTION) {
card.setIndex(filesize - END_FILE_SECTION); startPos = filesize - END_FILE_SECTION;
card.setIndex(startPos);
} }
while (!card.eof() && !result) { lcd_clear();
lcd_puts_at_P(0, 1, _i("Checking file"));////c=20 r=1
lcd_set_cursor(0, 2);
while (!card.eof() && !result) {
for (; blocksPrinted < (((card.get_sdpos() - startPos) * LCD_WIDTH) / bytesToCheck); blocksPrinted++)
lcd_print('\xFF'); //simple progress bar
card.sdprinting = true; card.sdprinting = true;
get_command(); get_command();
result = check_commands(); result = check_commands();
} }
for (; blocksPrinted < LCD_WIDTH; blocksPrinted++)
lcd_print('\xFF'); //simple progress bar
_delay(100); //for the user to see the end of the progress bar.
card.printingHasFinished(); card.printingHasFinished();
strncpy_P(lcd_status_message, _T(WELCOME_MSG), LCD_WIDTH); strncpy_P(lcd_status_message, _T(WELCOME_MSG), LCD_WIDTH);
lcd_finishstatus(); lcd_finishstatus();
return result; return result;