Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2025-04-07 17:56:56 +02:00
Code Issues Projects Releases Wiki Activity

reuse print instructions function, more efficiant read code

Browse Source
This commit is contained in:
smesgr9000 2024-05-10 19:13:19 +02:00
parent 94c6bd460a
commit 9e2ef3580c
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Cart_Reader/GBA.ino
View File

@ -604,8 +604,8 @@ void getCartInfo_GBA() {
display_Update(); display_Update();
wait(); wait();
} else { } else {
char tempStr2[2];
char tempStr[5]; char tempStr[5];
tempStr[4] = 0;
// cart not in list // cart not in list
cartSize = 0; cartSize = 0;
@ -640,10 +640,8 @@ void getCartInfo_GBA() {
myFile.seekCur(9); myFile.seekCur(9);
// Read 4 bytes into String, do it one at a time so byte order doesn't get mixed up // Read 4 bytes into String, do it one at a time so byte order doesn't get mixed up
sprintf(tempStr, "%c", myFile.read()); for (byte i = 0; i < 4; i++) {
for (byte i = 0; i < 3; i++) { tempStr[i] = char(myFile.read());
sprintf(tempStr2, "%c", myFile.read());
strcat(tempStr, tempStr2);
} }
// Check if string is a match // Check if string is a match
@ -662,23 +660,15 @@ void getCartInfo_GBA() {
myFile.seekCur(9); myFile.seekCur(9);
// Read 4 bytes into String, do it one at a time so byte order doesn't get mixed up // Read 4 bytes into String, do it one at a time so byte order doesn't get mixed up
sprintf(tempStr, "%c", myFile.read()); for (byte i = 0; i < 4; i++) {
for (byte i = 0; i < 3; i++) { tempStr[i] = char(myFile.read());
sprintf(tempStr2, "%c", myFile.read());
strcat(tempStr, tempStr2);
} }
// Skip the , in the file // Skip the , in the file
myFile.seekCur(1); myFile.seekCur(1);
// Read the next ascii character and subtract 48 to convert to decimal // Read the next ascii character and subtract 48 to convert to decimal
cartSize = myFile.read() - 48; cartSize = ((myFile.read() - 48) * 10) + (myFile.read() - 48);
// Remove leading 0 for single digit cart sizes
if (cartSize != 0) {
cartSize = cartSize * 10 + myFile.read() - 48;
} else {
cartSize = myFile.read() - 48;
}
// Skip the , in the file // Skip the , in the file
myFile.seekCur(1); myFile.seekCur(1);
@ -699,19 +689,7 @@ void getCartInfo_GBA() {
print_Msg(F("Save Lib: ")); print_Msg(F("Save Lib: "));
println_Msg(saveTypeStr); println_Msg(saveTypeStr);
#if defined(ENABLE_OLED) printInstructions();
print_STR(press_to_change_STR, 1);
print_STR(right_to_select_STR, 1);
#elif defined(ENABLE_LCD)
println_Msg(FS(FSTRING_EMPTY));
print_STR(rotate_to_change_STR, 1);
print_STR(press_to_select_STR, 1);
#elif defined(SERIAL_MONITOR)
println_Msg(FS(FSTRING_EMPTY));
println_Msg(F("U/D to Change"));
println_Msg(F("Space to Select"));
#endif
display_Update();
uint8_t b = 0; uint8_t b = 0;
while (1) { while (1) {