Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2025-02-27 18:13:34 +01:00
Code Issues Projects Releases Wiki Activity

remove duplicate code to open file for verfication

Browse Source
This commit is contained in:
smesgr9000 2024-05-20 11:57:32 +02:00
parent d7e795fbed
commit f82be2d5db
1 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Cart_Reader/FLASH.ino
View File

@ -1055,14 +1055,7 @@ word readWord_Flash(unsigned long myAddress) {
/****************************************** /******************************************
write helper functions write helper functions
*****************************************/ *****************************************/
bool openFlashFile() { bool openFileOnSD() {
// Create filepath
sprintf(filePath, "%s/%s", filePath, fileName);
print_STR(flashing_file_STR, 0);
print_Msg(filePath);
println_Msg(F("..."));
display_Update();
// Open file on sd card // Open file on sd card
if (myFile.open(filePath, O_READ)) { if (myFile.open(filePath, O_READ)) {
// Get rom size from file // Get rom size from file
@ -1076,6 +1069,24 @@ bool openFlashFile() {
return false; return false;
} }
bool openFlashFile() {
// Create filepath
sprintf(filePath, "%s/%s", filePath, fileName);
print_STR(flashing_file_STR, 0);
print_Msg(filePath);
println_Msg(F("..."));
display_Update();
return openFileOnSD();
}
bool openVerifyFlashFile() {
print_STR(verifying_STR, 1);
display_Update();
return openFileOnSD();
}
/****************************************** /******************************************
29F032 flashrom functions 29F032 flashrom functions
*****************************************/ *****************************************/
@ -1710,16 +1721,7 @@ void blankcheck_Flash() {
} }
void verifyFlash() { void verifyFlash() {
print_STR(verifying_STR, 1); if (openVerifyFlashFile()) {
display_Update();
// Open file on sd card
if (myFile.open(filePath, O_READ)) {
// Get rom size from file
fileSize = myFile.fileSize();
if (fileSize > flashSize)
print_FatalError(file_too_big_STR);
blank = 0; blank = 0;
for (unsigned long currByte = 0; currByte < fileSize; currByte += 512) { for (unsigned long currByte = 0; currByte < fileSize; currByte += 512) {
//fill sdBuffer //fill sdBuffer
@ -1741,9 +1743,6 @@ void verifyFlash() {
} }
// Close the file: // Close the file:
myFile.close(); myFile.close();
} else {
print_STR(open_file_STR, 1);
display_Update();
} }
} }
@ -1994,17 +1993,7 @@ void blankcheck16() {
} }
void verifyFlash16() { void verifyFlash16() {
print_STR(verifying_STR, 1); if (openVerifyFlashFile()) {
display_Update();
// Open file on sd card
if (myFile.open(filePath, O_READ)) {
// Get rom size from file
fileSize = myFile.fileSize();
if (fileSize > flashSize) {
print_FatalError(file_too_big_STR);
}
blank = 0; blank = 0;
word d = 0; word d = 0;
for (unsigned long currByte = 0; currByte < fileSize / 2; currByte += 256) { for (unsigned long currByte = 0; currByte < fileSize / 2; currByte += 256) {
@ -2031,9 +2020,6 @@ void verifyFlash16() {
} }
// Close the file: // Close the file:
myFile.close(); myFile.close();
} else {
println_Msg(F("Can't open file on SD."));
display_Update();
} }
} }
@ -2417,17 +2403,7 @@ void write_Eprom() {
} }
void verify_Eprom() { void verify_Eprom() {
print_STR(verifying_STR, 1); if (openVerifyFlashFile()) {
display_Update();
// Open file on sd card
if (myFile.open(filePath, O_READ)) {
// Get rom size from file
fileSize = myFile.fileSize();
if (fileSize > flashSize) {
print_FatalError(file_too_big_STR);
}
blank = 0; blank = 0;
word d = 0; word d = 0;
for (unsigned long currWord = 0; currWord < (fileSize / 2); currWord += 256) { for (unsigned long currWord = 0; currWord < (fileSize / 2); currWord += 256) {
@ -2454,9 +2430,6 @@ void verify_Eprom() {
} }
// Close the file: // Close the file:
myFile.close(); myFile.close();
} else {
println_Msg(F("Can't open file on SD."));
display_Update();
} }
} }