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

Merge pull request #854 from RWeick/master

Browse Source 
This updates the GBC Gameshark functions to check the Chip ID before performing any other functions, which ensures a good connection with the Gameshark cartridge and prevents erroneous dumps or writes due to poor connection.
This commit is contained in:
Richard Weick 2023-10-02 13:23:56 -05:00 committed by GitHub
commit 83b854ffeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 194 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Cart_Reader/GB.ino
View File

@ -3363,27 +3363,6 @@ void readGameshark_GB() {
strcpy(fileName, "Gameshark"); strcpy(fileName, "Gameshark");
strcat(fileName, ".GB"); strcat(fileName, ".GB");
// create a new folder for the rom file
EEPROM_readAnything(0, foldern);
sprintf(folder, "GB/ROM/Gameshark/%d", 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(create_file_STR);
}
word finalAddress = 0x5FFF; word finalAddress = 0x5FFF;
word startAddress= 0x4000; word startAddress= 0x4000;
word bankAddress = 0x7FE1; word bankAddress = 0x7FE1;
@ -3418,9 +3397,38 @@ void readGameshark_GB() {
delay(100); delay(100);
if (flashid == 0xBFB5) { if (flashid == 0xBFB5) {
display_Clear();
println_Msg(F("SST 39SF010")); println_Msg(F("SST 39SF010"));
println_Msg(F("Rom Size: 128 KB")); println_Msg(F("Rom Size: 128 KB"));
display_Update(); display_Update();
} else {
display_Clear();
println_Msg(F("Unknown Flash ID"));
println_Msg(F("Check Cartridge Connection"));
print_STR(press_button_STR, 1);
display_Update();
wait();
mainMenu();
}
// create a new folder for the rom file
EEPROM_readAnything(0, foldern);
sprintf(folder, "GB/ROM/Gameshark/%d", foldern);
sd.mkdir(folder, true);
sd.chdir(folder);
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(create_file_STR);
} }
// Initialize progress bar // Initialize progress bar
@ -3455,21 +3463,6 @@ void readGameshark_GB() {
****************************************************/ ****************************************************/
// Write Datel GBC Gameshark Device // Write Datel GBC Gameshark Device
void writeGameshark_GB() { void writeGameshark_GB() {
// Launch filebrowser
filePath[0] = '\0';
sd.chdir("/");
fileBrowser(F("Select file"));
display_Clear();
byte byte1;
bool toggle = true;
// Create filepath
sprintf(filePath, "%s/%s", filePath, fileName);
// Open file on sd card
if (myFile.open(filePath, O_READ)) {
// Enable Rom Banks // Enable Rom Banks
readByte_GB(0x101); readByte_GB(0x101);
readByte_GB(0x108); readByte_GB(0x108);
@ -3499,14 +3492,29 @@ void writeGameshark_GB() {
writeByte_GB(0x5555, 0xF0); writeByte_GB(0x5555, 0xF0);
if (flashid != 0xBFB5) { if (flashid != 0xBFB5) {
display_Clear();
println_Msg(F("Unknown Flash ID")); println_Msg(F("Unknown Flash ID"));
println_Msg(flashid); println_Msg(F("Check Cartridge Connection"));
print_STR(press_button_STR, 1); print_STR(press_button_STR, 1);
display_Update(); display_Update();
wait(); wait();
mainMenu(); mainMenu();
} }
}
// Launch filebrowser
filePath[0] = '\0';
sd.chdir("/");
fileBrowser(F("Select file"));
display_Clear();
byte byte1;
bool toggle = true;
// Create filepath
sprintf(filePath, "%s/%s", filePath, fileName);
// Open file on sd card
myFile.open(filePath, O_READ);
if (flashid == 0xBFB5) { if (flashid == 0xBFB5) {
println_Msg(F("SST 39SF010")); println_Msg(F("SST 39SF010"));