From 4040d2b2a6265f070b051783855b3ae2321ac288 Mon Sep 17 00:00:00 2001 From: smesgr9000 Date: Sun, 16 Jun 2024 10:55:50 +0200 Subject: [PATCH] define common string "Select file" --- Cart_Reader/FLASH.ino | 8 ++++---- Cart_Reader/GB.ino | 10 +++++----- Cart_Reader/MD.ino | 2 +- Cart_Reader/OSCR.cpp | 1 + Cart_Reader/OSCR.h | 1 + Cart_Reader/SMS.ino | 2 +- Cart_Reader/SUPRACAN.ino | 6 +++--- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Cart_Reader/FLASH.ino b/Cart_Reader/FLASH.ino index e8f25d7..6cdcb7c 100644 --- a/Cart_Reader/FLASH.ino +++ b/Cart_Reader/FLASH.ino @@ -148,7 +148,7 @@ void flashromMenu8() { case 3: filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); time = millis(); @@ -272,7 +272,7 @@ void flashromMenu16() { case 3: filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); time = millis(); if (flashid == 0xC2F3) { @@ -352,7 +352,7 @@ void epromMenu() { case 2: filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); time = millis(); write_Eprom(); @@ -2472,7 +2472,7 @@ void identifyCFI_Flash() { void writeCFI_Flash() { filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); if (openFlashFile()) { diff --git a/Cart_Reader/GB.ino b/Cart_Reader/GB.ino index 776762d..626de9a 100644 --- a/Cart_Reader/GB.ino +++ b/Cart_Reader/GB.ino @@ -65,7 +65,7 @@ bool gbxFlashCFI() { // Launch filebrowser filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); identifyCFI_GB(); if (!writeCFI_GB()) { @@ -1810,7 +1810,7 @@ void writeFlash29F_GB(byte MBC, boolean flashErase) { // Launch filebrowser filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); // Create filepath @@ -2565,7 +2565,7 @@ void writePelican_GB() { // Launch filebrowser filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); // Create filepath @@ -2932,7 +2932,7 @@ void writeMegaMem_GB() { // Write Datel Mega Memory Card Save Storage Chip SST28LF040 filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); // Create filepath @@ -3270,7 +3270,7 @@ void writeGameshark_GB() { // Launch filebrowser filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); byte byte1; diff --git a/Cart_Reader/MD.ino b/Cart_Reader/MD.ino index 64e92ab..3cc3af0 100644 --- a/Cart_Reader/MD.ino +++ b/Cart_Reader/MD.ino @@ -255,7 +255,7 @@ void mdMenu() { // Change working dir to root filePath[0] = '\0'; sd.chdir("/"); - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); display_Clear(); // Setting CS(PH3) LOW PORTH &= ~(1 << 3); diff --git a/Cart_Reader/OSCR.cpp b/Cart_Reader/OSCR.cpp index a4b288f..1612c61 100644 --- a/Cart_Reader/OSCR.cpp +++ b/Cart_Reader/OSCR.cpp @@ -70,6 +70,7 @@ constexpr char PROGMEM FSTRING_READ_SAVE[] = "Read Save"; constexpr char PROGMEM FSTRING_WRITE_SAVE[] = "Write Save"; constexpr char PROGMEM FSTRING_SELECT_CART[] = "Select Cart"; constexpr char PROGMEM FSTRING_SELECT_CART_TYPE[] = "Select Cart Type"; +constexpr char PROGMEM FSTRING_SELECT_FILE[] = "Select file"; constexpr char PROGMEM FSTRING_SET_SIZE[] = "Set Size"; constexpr char PROGMEM FSTRING_REFRESH_CART[] = "Refresh Cart"; constexpr char PROGMEM FSTRING_MAPPER[] = "Mapper: "; diff --git a/Cart_Reader/OSCR.h b/Cart_Reader/OSCR.h index c2bf695..6381d86 100644 --- a/Cart_Reader/OSCR.h +++ b/Cart_Reader/OSCR.h @@ -94,6 +94,7 @@ extern const char PROGMEM FSTRING_READ_SAVE[]; extern const char PROGMEM FSTRING_WRITE_SAVE[]; extern const char PROGMEM FSTRING_SELECT_CART[]; extern const char PROGMEM FSTRING_SELECT_CART_TYPE[]; +extern const char PROGMEM FSTRING_SELECT_FILE[]; extern const char PROGMEM FSTRING_SET_SIZE[]; extern const char PROGMEM FSTRING_REFRESH_CART[]; extern const char PROGMEM FSTRING_MAPPER[]; diff --git a/Cart_Reader/SMS.ino b/Cart_Reader/SMS.ino index 8de65aa..b7619b2 100644 --- a/Cart_Reader/SMS.ino +++ b/Cart_Reader/SMS.ino @@ -680,7 +680,7 @@ void writeSRAM_SMS() { if (false) { print_Error(F("DISABLED")); } else { - fileBrowser(F("Select file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); sd.chdir(); sprintf(filePath, "%s/%s", filePath, fileName); diff --git a/Cart_Reader/SUPRACAN.ino b/Cart_Reader/SUPRACAN.ino index 25a4fb3..bad2c14 100644 --- a/Cart_Reader/SUPRACAN.ino +++ b/Cart_Reader/SUPRACAN.ino @@ -193,7 +193,7 @@ static void readSRAM_Acan() { static void writeSRAM_Acan() { filePath[0] = 0; sd.chdir(); - fileBrowser(F("Select a file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); snprintf(filePath, FILEPATH_LENGTH, "%s/%s", filePath, fileName); display_Clear(); @@ -309,7 +309,7 @@ static void verifyUM6650() { static void writeUM6650() { filePath[0] = 0; sd.chdir("/"); - fileBrowser(F("Select a file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); snprintf(filePath, FILEPATH_LENGTH, "%s/%s", filePath, fileName); display_Clear(); @@ -344,7 +344,7 @@ static void flashCart_Acan() { filePath[0] = 0; sd.chdir(); - fileBrowser(F("Select a file")); + fileBrowser(FS(FSTRING_SELECT_FILE)); snprintf(filePath, FILEPATH_LENGTH, "%s/%s", filePath, fileName); display_Clear();