https://github.com/sanni/cartreader/issues/574#issuecomment-1286956251

1 files changed, 22 insertions, 21 deletions

diff --git a/Cart_Reader/WSV.ino b/Cart_Reader/WSV.ino
index d7ed265..c3a70a5 100644
--- a/Cart_Reader/WSV.ino
+++ b/Cart_Reader/WSV.ino
@@ -102,8 +102,8 @@ void setup_WSV() {
 static const char wsvMenuItem1[] PROGMEM = "Select Cart";
 static const char wsvMenuItem2[] PROGMEM = "Read ROM";
 static const char wsvMenuItem3[] PROGMEM = "Set Size";
-static const char wsvMenuItem4[] PROGMEM = "Reset";
-static const char* const menuOptionsSV[] PROGMEM = { wsvMenuItem1, wsvMenuItem2, wsvMenuItem3, wsvMenuItem4 };
+//static const char wsvMenuItem4[] PROGMEM = "Reset"; (stored in common strings array)
+static const char* const menuOptionsSV[] PROGMEM = { wsvMenuItem1, wsvMenuItem2, wsvMenuItem3, string_reset2 };
 
 void wsvMenu() {
   convertPgm(menuOptionsSV, 4);
@@ -198,14 +198,14 @@ void readROM_WSV() {
   sd.chdir(folder);
 
   display_Clear();
-  print_Msg(F("Saving to "));
+  print_STR(saving_to_STR, 0);
   print_Msg(folder);
   println_Msg(F("/..."));
   display_Update();
 
   // open file on sdcard
   if (!myFile.open(fileName, O_RDWR | O_CREAT))
-    print_Error(F("Can't create file on SD"), true);
+    print_Error(create_file_STR, true);
 
   // write new folder number back to EEPROM
   foldern++;
@@ -233,7 +233,8 @@ void readROM_WSV() {
   compareCRC("wsv.txt", 0, 1, 0);
 
   println_Msg(F(""));
-  println_Msg(F("Press Button..."));
+  // Prints string out of the common strings array either with or without newline
+  print_STR(press_button_STR, 1);
   display_Update();
   wait();
 }
@@ -256,11 +257,11 @@ void setROMSize_WSV() {
     println_Msg(WSV[i]);
     println_Msg(F(""));
 #if defined(enable_OLED)
-    println_Msg(F("Press left to Change"));
-    println_Msg(F("and right to Select"));
+    print_STR(press_to_change_STR, 1);
+    print_STR(right_to_select_STR, 1);
 #elif defined(enable_LCD)
-    println_Msg(F("Rotate to Change"));
-    println_Msg(F("Press to Select"));
+    print_STR(rotate_to_change_STR, 1);
+    print_STR(press_to_select_STR, 1);
 #endif
     display_Update();
 
@@ -278,11 +279,11 @@ void setROMSize_WSV() {
         println_Msg(WSV[i]);
         println_Msg(F(""));
 #if defined(enable_OLED)
-        println_Msg(F("Press left to Change"));
-        println_Msg(F("and right to Select"));
+        print_STR(press_to_change_STR, 1);
+        print_STR(right_to_select_STR, 1);
 #elif defined(enable_LCD)
-        println_Msg(F("Rotate to Change"));
-        println_Msg(F("Press to Select"));
+        print_STR(rotate_to_change_STR, 1);
+        print_STR(press_to_select_STR, 1);
 #endif
         display_Update();
       }
@@ -298,11 +299,11 @@ void setROMSize_WSV() {
         println_Msg(WSV[i]);
         println_Msg(F(""));
 #if defined(enable_OLED)
-        println_Msg(F("Press left to Change"));
-        println_Msg(F("and right to Select"));
+        print_STR(press_to_change_STR, 1);
+        print_STR(right_to_select_STR, 1);
 #elif defined(enable_LCD)
-        println_Msg(F("Rotate to Change"));
-        println_Msg(F("Press to Select"));
+        print_STR(rotate_to_change_STR, 1);
+        print_STR(press_to_select_STR, 1);
 #endif
         display_Update();
       }
@@ -478,11 +479,11 @@ void setCart_WSV() {
       println_Msg(F("KB"));
       println_Msg(F(""));
 #if defined(enable_OLED)
-      println_Msg(F("Press left to Change"));
-      println_Msg(F("and right to Select"));
+      print_STR(press_to_change_STR, 1);
+      print_STR(right_to_select_STR, 1);
 #elif defined(enable_LCD)
-      println_Msg(F("Rotate to Change"));
-      println_Msg(F("Press to Select"));
+      print_STR(rotate_to_change_STR, 1);
+      print_STR(press_to_select_STR, 1);
 #elif defined(SERIAL_MONITOR)
       println_Msg(F("U/D to Change"));
       println_Msg(F("Space to Select"));