diff --git a/Cart_Reader/GB.ino b/Cart_Reader/GB.ino index 4032d75..ea5ebd3 100644 --- a/Cart_Reader/GB.ino +++ b/Cart_Reader/GB.ino @@ -596,7 +596,7 @@ void setup_GB() { void showCartInfo_GB() { display_Clear(); if (strcmp(checksumStr, "00") != 0) { - print_Msg(F("Title: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); if (cartID[0] != 0) { print_Msg(F("Serial: ")); @@ -1276,7 +1276,7 @@ void compare_checksums_GB() { char calcsumStr[5]; sprintf(calcsumStr, "%04X", calc_checksum_GB(fileName)); - print_Msg(F("Checksum: ")); + print_Msg(FS(FSTRING_CHECKSUM)); print_Msg(calcsumStr); if (strcmp(calcsumStr, checksumStr) == 0) { println_Msg(F(" -> OK")); diff --git a/Cart_Reader/GBA.ino b/Cart_Reader/GBA.ino index 995d9e3..049709b 100644 --- a/Cart_Reader/GBA.ino +++ b/Cart_Reader/GBA.ino @@ -252,7 +252,7 @@ void setup_GBA() { display_Clear(); // Print start page - print_Msg(F("Title: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(F("Serial: ")); println_Msg(cartID); @@ -865,7 +865,7 @@ void readROM_GBA() { // Calculate the checksum of the dumped rom boolean compare_checksum_GBA() { - print_Msg(F("Checksum: ")); + print_Msg(FS(FSTRING_CHECKSUM)); display_Update(); strcpy(fileName, romName); diff --git a/Cart_Reader/LOOPY.ino b/Cart_Reader/LOOPY.ino index 65515c8..1510f20 100644 --- a/Cart_Reader/LOOPY.ino +++ b/Cart_Reader/LOOPY.ino @@ -494,9 +494,9 @@ void getCartInfo_LOOPY() { println_Msg(F("Cart Info")); println_Msg(FS(FSTRING_SPACE)); - print_Msg(F("Name: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(loopyRomNameLong); - print_Msg(F("Checksum: ")); + print_Msg(FS(FSTRING_CHECKSUM)); println_Msg(checksumStr); print_Msg(FS(FSTRING_SIZE)); print_Msg(cartSize * 8 / 1024 / 1024); diff --git a/Cart_Reader/MD.ino b/Cart_Reader/MD.ino index 6e3ee38..061c7f3 100644 --- a/Cart_Reader/MD.ino +++ b/Cart_Reader/MD.ino @@ -1295,7 +1295,7 @@ void getCartInfo_MD() { display_Clear(); println_Msg(F("Cart Info")); println_Msg(FS(FSTRING_SPACE)); - print_Msg(F("Name: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); if (bramCheck != 0x00FF) { print_Msg(F("bramCheck: ")); diff --git a/Cart_Reader/N64.ino b/Cart_Reader/N64.ino index a53ef8b..4ceae78 100644 --- a/Cart_Reader/N64.ino +++ b/Cart_Reader/N64.ino @@ -1926,7 +1926,7 @@ void printCartInfo_N64() { // Print start page if (cartSize != 0) { display_Clear(); - print_Msg(F("Title: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(F("Serial: ")); println_Msg(cartID); @@ -1970,7 +1970,7 @@ void printCartInfo_N64() { display_Clear(); println_Msg(F("GAMEPAK ERROR")); println_Msg(""); - print_Msg(F("Title: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(F("Serial: ")); println_Msg(cartID); diff --git a/Cart_Reader/NGP.ino b/Cart_Reader/NGP.ino index c0f0744..0771832 100644 --- a/Cart_Reader/NGP.ino +++ b/Cart_Reader/NGP.ino @@ -171,7 +171,7 @@ void printCartInfo_NGP() { println_Msg(F("NGP Cart Info")); - print_Msg(F("Name: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(F("App ID: ")); diff --git a/Cart_Reader/OSCR.cpp b/Cart_Reader/OSCR.cpp index 3370297..a4b288f 100644 --- a/Cart_Reader/OSCR.cpp +++ b/Cart_Reader/OSCR.cpp @@ -74,6 +74,8 @@ constexpr char PROGMEM FSTRING_SET_SIZE[] = "Set Size"; constexpr char PROGMEM FSTRING_REFRESH_CART[] = "Refresh Cart"; constexpr char PROGMEM FSTRING_MAPPER[] = "Mapper: "; constexpr char PROGMEM FSTRING_SIZE[] = "Size: "; +constexpr char PROGMEM FSTRING_NAME[] = "Name: "; +constexpr char PROGMEM FSTRING_CHECKSUM[] = "Checksum: "; constexpr char PROGMEM FSTRING_ROM_SIZE[] ="ROM SIZE: "; /*==== /CONSTANTS =================================================*/ diff --git a/Cart_Reader/OSCR.h b/Cart_Reader/OSCR.h index 1a4ff98..5fde9d4 100644 --- a/Cart_Reader/OSCR.h +++ b/Cart_Reader/OSCR.h @@ -55,6 +55,8 @@ extern const char PROGMEM FSTRING_REFRESH_CART[]; extern const char PROGMEM FSTRING_MAPPER[]; extern const char PROGMEM FSTRING_SIZE[]; extern const char PROGMEM FSTRING_ROM_SIZE[]; +extern const char PROGMEM FSTRING_NAME[]; +extern const char PROGMEM FSTRING_CHECKSUM[]; #define FS(pmem_string) (reinterpret_cast(pmem_string)) diff --git a/Cart_Reader/SFM.ino b/Cart_Reader/SFM.ino index fa32782..276c51a 100644 --- a/Cart_Reader/SFM.ino +++ b/Cart_Reader/SFM.ino @@ -735,14 +735,14 @@ void getCartInfo_SFM() { } display_Clear(); - print_Msg(F("Name: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); println_Msg(FS(FSTRING_SPACE)); print_Msg(F("Version: 1.")); println_Msg(romVersion); - print_Msg(F("Checksum: ")); + print_Msg(FS(FSTRING_CHECKSUM)); println_Msg(checksumStr); print_Msg(FS(FSTRING_SIZE)); diff --git a/Cart_Reader/SMS.ino b/Cart_Reader/SMS.ino index a1680ae..8de65aa 100644 --- a/Cart_Reader/SMS.ino +++ b/Cart_Reader/SMS.ino @@ -507,7 +507,7 @@ void getCartInfo_SMS() { display_Clear(); println_Msg(F("SMS/GG header not found")); println_Msg(FS(FSTRING_SPACE)); - print_Msg(F("Name: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(F("Selected Size: ")); print_Msg(cartSize / 1024); @@ -525,7 +525,7 @@ void getCartInfo_SMS() { println_Msg(F("GG header info")); } println_Msg(FS(FSTRING_SPACE)); - print_Msg(F("Name: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(FS(FSTRING_SIZE)); print_Msg(cartSize / 1024); diff --git a/Cart_Reader/SNES.ino b/Cart_Reader/SNES.ino index 3fb5d8f..884c402 100644 --- a/Cart_Reader/SNES.ino +++ b/Cart_Reader/SNES.ino @@ -758,7 +758,7 @@ void getCartInfo_SNES() { } display_Clear(); - print_Msg(F("Title: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(F("Revision: ")); @@ -846,7 +846,7 @@ void getCartInfo_SNES() { print_Msg(sramSize >> 3); println_Msg(F(" KB")); - print_Msg(F("Checksum: ")); + print_Msg(FS(FSTRING_CHECKSUM)); println_Msg(checksumStr); display_Update(); @@ -876,7 +876,7 @@ void checkAltConf(char crcStr[9]) { // Get cart info display_Clear(); println_Msg(F("Searching database...")); - print_Msg(F("Checksum: ")); + print_Msg(FS(FSTRING_CHECKSUM)); println_Msg(checksumStr); display_Update(); diff --git a/Cart_Reader/VBOY.ino b/Cart_Reader/VBOY.ino index 7abe8c2..6218975 100644 --- a/Cart_Reader/VBOY.ino +++ b/Cart_Reader/VBOY.ino @@ -381,7 +381,7 @@ void getCartInfo_VB() { display_Clear(); println_Msg(F("Cart Info")); println_Msg(FS(FSTRING_SPACE)); - print_Msg(F("Name: ")); + print_Msg(FS(FSTRING_NAME)); println_Msg(romName); print_Msg(FS(FSTRING_SIZE)); print_Msg(cartSize * 8 / 1024 / 1024); diff --git a/Cart_Reader/WS.ino b/Cart_Reader/WS.ino index 3105458..77c0b3d 100644 --- a/Cart_Reader/WS.ino +++ b/Cart_Reader/WS.ino @@ -403,7 +403,7 @@ static void showCartInfo_WS() { print_Msg(F("Version: 1.")); println_Msg(romVersion, HEX); - print_Msg(F("Checksum: ")); + print_Msg(FS(FSTRING_CHECKSUM)); println_Msg(checksumStr); // Prints string out of the common strings array either with or without newline