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

Factory reset and check_file progress bar

Browse source
This commit is contained in:
Alex Voinea 2021-02-25 21:04:05 +02:00
parent 8821439878
commit 204da1cc3f
No known key found for this signature in database
GPG key ID: F5034E7CFCF2F973
2 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Firmware/Marlin_main.cpp
View file

@ -710,7 +710,6 @@ void softReset()
// Factory reset function // Factory reset function
// This function is used to erase parts or whole EEPROM memory which is used for storing calibration and and so on. // This function is used to erase parts or whole EEPROM memory which is used for storing calibration and and so on.
// Level input parameter sets depth of reset // Level input parameter sets depth of reset
int er_progress = 0;
static void factory_reset(char level) static void factory_reset(char level)
{ {
lcd_clear(); lcd_clear();
@ -790,28 +789,15 @@ static void factory_reset(char level)
// Level 3: erase everything, whole EEPROM will be set to 0xFF // Level 3: erase everything, whole EEPROM will be set to 0xFF
case 3: case 3:
lcd_puts_P(PSTR("Factory RESET")); menu_progressbar_init(EEPROM_TOP, PSTR("ERASING all data"));
lcd_puts_at_P(1, 2, PSTR("ERASING all data")); Sound_MakeCustom(100,0,false);
Sound_MakeCustom(100,0,false);
er_progress = 0;
lcd_puts_at_P(3, 3, PSTR(" "));
lcd_set_cursor(3, 3);
lcd_print(er_progress);
// Erase EEPROM // Erase EEPROM
for (int i = 0; i < 4096; i++) { for (uint16_t i = 0; i < EEPROM_TOP; i++) {
eeprom_update_byte((uint8_t*)i, 0xFF); eeprom_update_byte((uint8_t*)i, 0xFF);
menu_progressbar_update(i);
if (i % 41 == 0) {
er_progress++;
lcd_puts_at_P(3, 3, PSTR(" "));
lcd_set_cursor(3, 3);
lcd_print(er_progress);
lcd_puts_P(PSTR("%"));
}
} }
menu_progressbar_finish();
softReset(); softReset();

16
Firmware/ultralcd.cpp
View file

@ -8403,7 +8403,6 @@ static bool check_file(const char* filename) {
const uint32_t filesize = card.getFileSize(); const uint32_t filesize = card.getFileSize();
uint32_t startPos = 0; uint32_t startPos = 0;
const uint16_t bytesToCheck = min(END_FILE_SECTION, filesize); const uint16_t bytesToCheck = min(END_FILE_SECTION, filesize);
uint8_t blocksPrinted = 0;
if (filesize > END_FILE_SECTION) { if (filesize > END_FILE_SECTION) {
startPos = filesize - END_FILE_SECTION; startPos = filesize - END_FILE_SECTION;
card.setIndex(startPos); card.setIndex(startPos);
@ -8411,22 +8410,15 @@ static bool check_file(const char* filename) {
cmdqueue_reset(); cmdqueue_reset();
cmdqueue_serial_disabled = true; cmdqueue_serial_disabled = true;
lcd_clear(); menu_progressbar_init(bytesToCheck, _i("Checking file"));
lcd_puts_at_P(0, 1, _i("Checking file"));////c=20 r=1
lcd_set_cursor(0, 2);
while (!card.eof() && !result) { while (!card.eof() && !result) {
for (; blocksPrinted < (((card.get_sdpos() - startPos) * LCD_WIDTH) / bytesToCheck); blocksPrinted++) menu_progressbar_update(card.get_sdpos() - startPos);
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++) menu_progressbar_finish();
lcd_print('\xFF'); //simple progress bar
_delay(100); //for the user to see the end of the progress bar.
cmdqueue_serial_disabled = false; cmdqueue_serial_disabled = false;
card.printingHasFinished(); card.printingHasFinished();