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

little cleanup and optimization in NES.ino

Browse Source 
little cleanup and optimization in NES.ino
This commit is contained in:
nsx0r 2023-05-01 11:57:04 +02:00 committed by GitHub
parent 8c13b615d2
commit 584d8f67ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Cart_Reader/NES.ino
View File

@ -209,13 +209,13 @@ const char _file_name_with_number_fmt[] PROGMEM = "%s.%02d.%s";
byte mapcount = (sizeof(mapsize) / sizeof(mapsize[0])) / 7; byte mapcount = (sizeof(mapsize) / sizeof(mapsize[0])) / 7;
byte mapselect; byte mapselect;
const int PRG[] PROGMEM = { 16, 32, 64, 128, 256, 512, 1024, 2048, 4096 }; const int PRG[] PROGMEM = { 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 };
byte prglo = 0; // Lowest Entry byte prglo = 0; // Lowest Entry
byte prghi = 8; // Highest Entry byte prghi = 11; // Highest Entry
const int CHR[] PROGMEM = { 0, 8, 16, 32, 64, 128, 256, 512, 1024 }; const int CHR[] PROGMEM = { 0, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096 };
byte chrlo = 0; // Lowest Entry byte chrlo = 0; // Lowest Entry
byte chrhi = 8; // Highest Entry byte chrhi = 10; // Highest Entry
const byte RAM[] PROGMEM = { 0, 8, 16, 32 }; const byte RAM[] PROGMEM = { 0, 8, 16, 32 };
byte ramlo = 0; // Lowest Entry byte ramlo = 0; // Lowest Entry
@ -576,7 +576,7 @@ void getMapping() {
println_Msg(F("No data found.")); println_Msg(F("No data found."));
println_Msg(F("Using manual selection")); println_Msg(F("Using manual selection"));
display_Update(); display_Update();
delay(1000); delay(500);
setDefaultRomName(); setDefaultRomName();
browseDatabase = selectMapping(database); browseDatabase = selectMapping(database);
} else { } else {
@ -1822,7 +1822,7 @@ chooseMapper:
print_Msg(newmapper); print_Msg(newmapper);
println_Msg(F(" SELECTED")); println_Msg(F(" SELECTED"));
display_Update(); display_Update();
delay(1000); delay(500);
// Serial Monitor // Serial Monitor
#elif defined(enable_serial) #elif defined(enable_serial)
@ -1968,7 +1968,7 @@ void setPRGSize() {
print_Msg(pgm_read_word(&(PRG[newprgsize]))); print_Msg(pgm_read_word(&(PRG[newprgsize])));
println_Msg(F("K")); println_Msg(F("K"));
display_Update(); display_Update();
delay(1000); delay(500);
#elif defined(enable_serial) #elif defined(enable_serial)
if (prglo == prghi) if (prglo == prghi)
@ -2088,7 +2088,7 @@ void setCHRSize() {
print_Msg(pgm_read_word(&(CHR[newchrsize]))); print_Msg(pgm_read_word(&(CHR[newchrsize])));
println_Msg(F("K")); println_Msg(F("K"));
display_Update(); display_Update();
delay(1000); delay(500);
#elif defined(enable_serial) #elif defined(enable_serial)
if (chrlo == chrhi) if (chrlo == chrhi)
@ -2279,7 +2279,7 @@ void setRAMSize() {
println_Msg(F("K")); println_Msg(F("K"));
} }
display_Update(); display_Update();
delay(1000); delay(500);
#elif defined(enable_serial) #elif defined(enable_serial)
if (ramlo == ramhi) if (ramlo == ramhi)
@ -2551,6 +2551,7 @@ void readPRG(bool readrom) {
break; break;
case 2: // bus conflicts - fixed last bank case 2: // bus conflicts - fixed last bank
case 30: // bus conflicts in non-flashable configuration
banks = int_pow(2, prgsize); banks = int_pow(2, prgsize);
busConflict = true; busConflict = true;
for (int i = 0; i < banks - 1; i++) { for (int i = 0; i < banks - 1; i++) {
@ -2786,19 +2787,6 @@ void readPRG(bool readrom) {
} }
break; break;
case 30: // 256K/512K
banks = int_pow(2, prgsize);
for (int i = 0; i < banks; i++) { // 256K/512K
if (flashfound)
write_prg_byte(0xC000 + i, i); // Flashable
else
write_prg_byte(0x8000 + i, i); // Non-Flashable
for (word address = 0x0; address < 0x4000; address += 512) { // 16K Banks ($8000-$BFFF)
dumpPRG(base, address);
}
}
break;
case 31: case 31:
banks = int_pow(2, prgsize) * 4; banks = int_pow(2, prgsize) * 4;
for (int i = 0; i < banks; i += 8) { for (int i = 0; i < banks; i += 8) {