aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorsmesgr9000 <smesgr9000>2024-06-29 11:28:41 +0200
committersmesgr9000 <smesgr9000>2024-06-29 11:28:41 +0200
commit9e13964889d244dd9a9ba0a048af432db257e5d8 (patch)
tree5f86e2d4673991bd16033e523230c728523d1b4e
parentacc069e1039911592eeb6a53f0471323c55b76c7 (diff)
downloadcartreader-9e13964889d244dd9a9ba0a048af432db257e5d8.tar.gz
cartreader-9e13964889d244dd9a9ba0a048af432db257e5d8.zip
reuse common string "ROM Size: "
Diffstat
-rw-r--r--Cart_Reader/5200.ino2
-rw-r--r--Cart_Reader/7800.ino2
-rw-r--r--Cart_Reader/ARC.ino2
-rw-r--r--Cart_Reader/C64.ino2
-rw-r--r--Cart_Reader/COLV.ino2
-rw-r--r--Cart_Reader/FAIRCHILD.ino2
-rw-r--r--Cart_Reader/GB.ino11
-rw-r--r--Cart_Reader/GBA.ino4
-rw-r--r--Cart_Reader/INTV.ino2
-rw-r--r--Cart_Reader/MD.ino2
-rw-r--r--Cart_Reader/MSX.ino2
-rw-r--r--Cart_Reader/N64.ino2
-rw-r--r--Cart_Reader/NGP.ino2
-rw-r--r--Cart_Reader/ODY2.ino2
-rw-r--r--Cart_Reader/OSCR.cpp2
-rw-r--r--Cart_Reader/SUPRACAN.ino2
-rw-r--r--Cart_Reader/VECTREX.ino2
-rw-r--r--Cart_Reader/WS.ino2
-rw-r--r--Cart_Reader/WSV.ino2
19 files changed, 26 insertions, 23 deletions
diff --git a/Cart_Reader/5200.ino b/Cart_Reader/5200.ino
index 4cf137e..2b881d4 100644
--- a/Cart_Reader/5200.ino
+++ b/Cart_Reader/5200.ino
@@ -332,7 +332,7 @@ void checkMapperSize_5200() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_5200(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(a5200[index]);
}
#endif
diff --git a/Cart_Reader/7800.ino b/Cart_Reader/7800.ino
index fee491d..778bbcc 100644
--- a/Cart_Reader/7800.ino
+++ b/Cart_Reader/7800.ino
@@ -478,7 +478,7 @@ void println_Mapper7800(byte mapper) {
void printRomSize_7800(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(a7800[index]);
}
#endif
diff --git a/Cart_Reader/ARC.ino b/Cart_Reader/ARC.ino
index d3c62a0..b3179d8 100644
--- a/Cart_Reader/ARC.ino
+++ b/Cart_Reader/ARC.ino
@@ -179,7 +179,7 @@ void readROM_ARC() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_ARC(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(ARC[index]);
}
#endif
diff --git a/Cart_Reader/C64.ino b/Cart_Reader/C64.ino
index cac9258..c34537d 100644
--- a/Cart_Reader/C64.ino
+++ b/Cart_Reader/C64.ino
@@ -629,7 +629,7 @@ void checkMapperSize_C64() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_C64(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(C64[index]);
}
#endif
diff --git a/Cart_Reader/COLV.ino b/Cart_Reader/COLV.ino
index 4a5afb2..56b7401 100644
--- a/Cart_Reader/COLV.ino
+++ b/Cart_Reader/COLV.ino
@@ -204,7 +204,7 @@ void readROM_COL() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_COL(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(pgm_read_byte(&(COL[index])));
}
#endif
diff --git a/Cart_Reader/FAIRCHILD.ino b/Cart_Reader/FAIRCHILD.ino
index 03b7111..e665c45 100644
--- a/Cart_Reader/FAIRCHILD.ino
+++ b/Cart_Reader/FAIRCHILD.ino
@@ -496,7 +496,7 @@ void read16K_FAIRCHILD() { // Read 16K Bytes
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_FAIRCHILD(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(FAIRCHILD[index]);
}
#endif
diff --git a/Cart_Reader/GB.ino b/Cart_Reader/GB.ino
index 626de9a..c459a0e 100644
--- a/Cart_Reader/GB.ino
+++ b/Cart_Reader/GB.ino
@@ -597,7 +597,7 @@ void showCartInfo_GB() {
print_Msg(F("M161"));
println_Msg(FS(FSTRING_EMPTY));
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
switch (romSize) {
case 0:
print_Msg(F("32 KB"));
@@ -2486,7 +2486,8 @@ void readPelican_GB() {
if (flashid == 0xDA45 || flashid == 0xBF10) {
println_Msg(F("29EE020 / W29C020"));
println_Msg(F("Banks Used: 32/64"));
- println_Msg(F("Rom Size: 256 KB"));
+ print_Msg(FS(FSTRING_ROM_SIZE));
+ println_Msg(F("256 KB"));
romBanks = 32;
display_Update();
} else {
@@ -2514,7 +2515,8 @@ void readPelican_GB() {
if (flashid == 0xBF04) {
println_Msg(F("SST 28LF040"));
println_Msg(F("Banks Used: 64/64"));
- println_Msg(F("Rom Size: 512 KB"));
+ print_Msg(FS(FSTRING_ROM_SIZE));
+ println_Msg(F("512 KB"));
romBanks = 64;
display_Update();
}
@@ -3185,7 +3187,8 @@ void readGameshark_GB() {
if (flashid == 0xBFB5) {
display_Clear();
println_Msg(F("SST 39SF010"));
- println_Msg(F("Rom Size: 128 KB"));
+ print_Msg(FS(FSTRING_ROM_SIZE));
+ println_Msg(F("128 KB"));
display_Update();
} else {
display_Clear();
diff --git a/Cart_Reader/GBA.ino b/Cart_Reader/GBA.ino
index 94bf9ea..37538ff 100644
--- a/Cart_Reader/GBA.ino
+++ b/Cart_Reader/GBA.ino
@@ -258,7 +258,7 @@ void setup_GBA() {
println_Msg(cartID);
print_Msg(F("Revision: "));
println_Msg(romVersion);
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
if (cartSize == 0)
println_Msg(F("Unknown"));
else {
@@ -683,7 +683,7 @@ void getCartInfo_GBA() {
println_Msg(gamename);
print_Msg(F("Serial: "));
println_Msg(tempStr);
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
print_Msg(cartSize);
println_Msg(F(" MB"));
print_Msg(F("Save Lib: "));
diff --git a/Cart_Reader/INTV.ino b/Cart_Reader/INTV.ino
index 8c945fe..6580779 100644
--- a/Cart_Reader/INTV.ino
+++ b/Cart_Reader/INTV.ino
@@ -524,7 +524,7 @@ void checkMapperSize_INTV() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_INTV(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(pgm_read_byte(&(INTV[index])));
}
#endif
diff --git a/Cart_Reader/MD.ino b/Cart_Reader/MD.ino
index 3cc3af0..4bed801 100644
--- a/Cart_Reader/MD.ino
+++ b/Cart_Reader/MD.ino
@@ -2888,7 +2888,7 @@ void readRealtec_MD() {
void printRomSize_MD(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
print_Msg(pgm_read_byte(&(MDSize[index])));
println_Msg(F(" Mbit"));
}
diff --git a/Cart_Reader/MSX.ino b/Cart_Reader/MSX.ino
index 51dbe95..a361c51 100644
--- a/Cart_Reader/MSX.ino
+++ b/Cart_Reader/MSX.ino
@@ -889,7 +889,7 @@ void checkMapperSize_MSX() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_MSX(uint8_t index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(MSX[index]);
}
#endif
diff --git a/Cart_Reader/N64.ino b/Cart_Reader/N64.ino
index 7031393..46a5a2a 100644
--- a/Cart_Reader/N64.ino
+++ b/Cart_Reader/N64.ino
@@ -1929,7 +1929,7 @@ void printCartInfo_N64() {
println_Msg(cartID);
print_Msg(F("Revision: "));
println_Msg(romVersion);
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
print_Msg(cartSize);
println_Msg(F(" MB"));
print_Msg(F("Save Type: "));
diff --git a/Cart_Reader/NGP.ino b/Cart_Reader/NGP.ino
index 0771832..52ae22c 100644
--- a/Cart_Reader/NGP.ino
+++ b/Cart_Reader/NGP.ino
@@ -188,7 +188,7 @@ void printCartInfo_NGP() {
else
println_Msg(F("Unknown"));
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
if (cartSize == 0) {
println_Msg(F("Unknown"));
} else {
diff --git a/Cart_Reader/ODY2.ino b/Cart_Reader/ODY2.ino
index aca0464..26cd1b1 100644
--- a/Cart_Reader/ODY2.ino
+++ b/Cart_Reader/ODY2.ino
@@ -257,7 +257,7 @@ void readROM_ODY2() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_ODY2(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(ODY2[index]);
}
#endif
diff --git a/Cart_Reader/OSCR.cpp b/Cart_Reader/OSCR.cpp
index 6b33a38..918e623 100644
--- a/Cart_Reader/OSCR.cpp
+++ b/Cart_Reader/OSCR.cpp
@@ -77,7 +77,7 @@ 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: ";
+constexpr char PROGMEM FSTRING_ROM_SIZE[] ="ROM Size: ";
/*==== /CONSTANTS =================================================*/
diff --git a/Cart_Reader/SUPRACAN.ino b/Cart_Reader/SUPRACAN.ino
index 956c2fe..910b931 100644
--- a/Cart_Reader/SUPRACAN.ino
+++ b/Cart_Reader/SUPRACAN.ino
@@ -416,7 +416,7 @@ static void checkRomExist_Acan() {
if (cartSize == 0)
print_Error(F("Unable to find rom signature..."));
else {
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
print_Msg(romSize);
println_Msg(F(" Mb"));
}
diff --git a/Cart_Reader/VECTREX.ino b/Cart_Reader/VECTREX.ino
index f5dba3b..a61520b 100644
--- a/Cart_Reader/VECTREX.ino
+++ b/Cart_Reader/VECTREX.ino
@@ -238,7 +238,7 @@ void readROM_VECTREX() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_VECTREX(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(VECTREX[index]);
}
#endif
diff --git a/Cart_Reader/WS.ino b/Cart_Reader/WS.ino
index 77c0b3d..29b8450 100644
--- a/Cart_Reader/WS.ino
+++ b/Cart_Reader/WS.ino
@@ -376,7 +376,7 @@ static void showCartInfo_WS() {
print_Msg(F("Game: "));
println_Msg(romName);
- print_Msg(F("Rom Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
if (cartSize == 0x00)
println_Msg(romSize, HEX);
else {
diff --git a/Cart_Reader/WSV.ino b/Cart_Reader/WSV.ino
index 7360875..fbaf6b7 100644
--- a/Cart_Reader/WSV.ino
+++ b/Cart_Reader/WSV.ino
@@ -222,7 +222,7 @@ void readROM_WSV() {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
void printRomSize_WSV(int index) {
display_Clear();
- print_Msg(F("ROM Size: "));
+ print_Msg(FS(FSTRING_ROM_SIZE));
println_Msg(pgm_read_word(&(WSV[index])));
}
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 02:47:24 +0000