Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-30 08:24:14 +01:00
Code Issues Projects Releases Wiki Activity

remove duplicate code to store NES games with and without header

Browse Source
This commit is contained in:
smesgr9000 2024-05-03 21:56:22 +02:00
parent 5f3d63a123
commit 4b70766094
1 changed files with 18 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Cart_Reader/NES.ino
View File

@ -236,7 +236,6 @@ word eepsize;
uint8_t bytecheck; uint8_t bytecheck;
uint8_t firstbyte; uint8_t firstbyte;
bool flashfound = false; // NESmaker 39SF040 Flash Cart bool flashfound = false; // NESmaker 39SF040 Flash Cart
bool busConflict = false;
// Cartridge Config // Cartridge Config
uint8_t mapper; uint8_t mapper;
@ -336,7 +335,7 @@ void nesMenu() {
resetROM(); resetROM();
} else { } else {
display_Clear(); display_Clear();
println_Msg(F("Error:")); println_Msg(FS(string_error5));
println_Msg(F("Can't write to this cartridge")); println_Msg(F("Can't write to this cartridge"));
println_Msg(FS(FSTRING_EMPTY)); println_Msg(FS(FSTRING_EMPTY));
// Prints string out of the common strings array either with or without newline // Prints string out of the common strings array either with or without newline
@ -709,10 +708,10 @@ bool selectMapping(FsFile& database) {
return 1; return 1;
} }
void readRom_NES() { void read_NES(const char* fileSuffix, const byte* header, const uint8_t headersize, const boolean renamerom) {
// Get name, add extension and convert to char array for sd lib // Get name, add extension and convert to char array for sd lib
strcpy(fileName, romName); strcpy(fileName, romName);
strcat(fileName, ".nes"); strcat(fileName, fileSuffix);
// create a new folder // create a new folder
EEPROM_readAnything(0, foldern); EEPROM_readAnything(0, foldern);
@ -737,15 +736,17 @@ void readRom_NES() {
//Initialize progress bar //Initialize progress bar
uint32_t processedProgressBar = 0; uint32_t processedProgressBar = 0;
uint32_t totalProgressBar = (uint32_t)(16 + prgsize * 16 * 1024 + chrsize * 4 * 1024); uint32_t totalProgressBar = (uint32_t)(headersize + prgsize * 16 * 1024 + chrsize * 4 * 1024);
draw_progressbar(0, totalProgressBar); draw_progressbar(0, totalProgressBar);
//Write iNES header //Write header
myFile.write(iNES_HEADER, 16); if(headersize > 0) {
myFile.write(header, headersize);
// update progress bar // update progress bar
processedProgressBar += 16; processedProgressBar += headersize;
draw_progressbar(processedProgressBar, totalProgressBar); draw_progressbar(processedProgressBar, totalProgressBar);
}
//Write PRG //Write PRG
readPRG(true); readPRG(true);
@ -765,59 +766,15 @@ void readRom_NES() {
myFile.close(); myFile.close();
// Compare CRC32 with database // Compare CRC32 with database
compareCRC("nes.txt", 0, 1, 16); compareCRC("nes.txt", 0, renamerom, headersize);
}
void readRom_NES() {
read_NES(".nes", iNES_HEADER, 16, true);
} }
void readRaw_NES() { void readRaw_NES() {
// Get name, add extension and convert to char array for sd lib read_NES(".bin", NULL, 0, false);
strcpy(fileName, romName);
strcat(fileName, ".bin");
// create a new folder
EEPROM_readAnything(0, foldern);
sprintf(folder, "NES/ROM/%s/%d", romName, foldern);
sd.mkdir(folder, true);
sd.chdir(folder);
display_Clear();
print_STR(saving_to_STR, 0);
print_Msg(folder);
println_Msg(F("/..."));
display_Update();
// write new folder number back to eeprom
foldern = foldern + 1;
EEPROM_writeAnything(0, foldern);
// Open file on sd card
if (!myFile.open(fileName, O_RDWR | O_CREAT)) {
print_FatalError(sd_error_STR);
}
//Initialize progress bar
uint32_t processedProgressBar = 0;
uint32_t totalProgressBar = (uint32_t)(prgsize * 16 * 1024 + chrsize * 4 * 1024);
draw_progressbar(0, totalProgressBar);
//Write PRG
readPRG(true);
// update progress bar
processedProgressBar += prgsize * 16 * 1024;
draw_progressbar(processedProgressBar, totalProgressBar);
//Write CHR
readCHR(true);
// update progress bar
processedProgressBar += chrsize * 4 * 1024;
draw_progressbar(processedProgressBar, totalProgressBar);
// Close the file:
myFile.close();
// Compare CRC32 with database
compareCRC("nes.txt", 0, 0, 0);
} }
/****************************************** /******************************************