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

Adjusted progress bar

This commit is contained in:
Alex Voinea 2020-01-08 21:32:45 +02:00
parent e295c83d09
commit 29d0537004
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Firmware/cardreader.cpp
View File

@ -809,12 +809,10 @@ void CardReader::presort() {
if (!IS_SD_INSERTED) return; if (!IS_SD_INSERTED) return;
int8_t percent = (counter * 100) / total; int8_t percent = (counter * 100) / total;
lcd_set_cursor(0, 2);
for (int column = 0; column < 20; column++) { for (int column = 0; column < 20; column++) {
if (column < (percent / 5)) if (column < (percent / 5)) lcd_print('\xFF'); //simple progress bar
{ else lcd_print(' ');
lcd_set_cursor(column, 2);
lcd_print('\xFF'); //simple progress bar
}
} }
counter++; counter++;
@ -873,12 +871,10 @@ void CardReader::presort() {
bool didSwap = false; bool didSwap = false;
int8_t percent = (counter * 100) / total;//((counter * 100) / pow((fileCnt-1),2)); int8_t percent = (counter * 100) / total;//((counter * 100) / pow((fileCnt-1),2));
lcd_set_cursor(0, 2);
for (int column = 0; column < 20; column++) { for (int column = 0; column < 20; column++) {
if (column < (percent / 5)) if (column < (percent / 5)) lcd_print('\xFF'); //simple progress bar
{ else lcd_print(' ');
lcd_set_cursor(column, 2);
lcd_print('\xFF'); //simple progress bar
}
} }
counter++; counter++;
@ -936,11 +932,8 @@ void CardReader::presort() {
sort_count = fileCnt; sort_count = fileCnt;
} }
#if !SDSORT_USES_RAM //show progresss bar only if slow sorting method is used #if !SDSORT_USES_RAM //show progresss bar only if slow sorting method is used
for (int column = 0; column <= 19; column++) lcd_set_cursor(0, 2);
{ for (int column = 0; column <= 19; column++) lcd_print('\xFF'); //simple progress bar
lcd_set_cursor(column, 2);
lcd_print('\xFF'); //simple progress bar
}
_delay(300); _delay(300);
lcd_clear(); lcd_clear();
#endif #endif