Skip to content

Commit

Permalink
Follow up to/fix for e61ac41
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ancyker
Ancyker committed Mar 2, 2024
1 parent e61ac41 commit a86f140
Show file tree
Hide file tree
Showing 14 changed files with 82 additions and 82 deletions.
10 changes: 5 additions & 5 deletions Cart_Reader/2600.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ void checkStatus_2600() {
else
Serial.print(a2600[a2600size]);
Serial.println(F("K"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down Expand Up @@ -956,12 +956,12 @@ bool getCartListInfo_2600() {
println_Msg(F("FAST CYCLE OFF"));
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("FAST CYCLE OFF"));
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
Serial.println(F("HOLD TO SELECT"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
while (readVals_ATARI(a2600game, a2600mm, a2600ll)) {
if (strcmp(a2600csvEND, a2600game) == 0) {
Expand Down Expand Up @@ -1040,13 +1040,13 @@ void checkCSV_2600() {
println_Msg(new2600mapper, HEX);
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("CART SELECTED"));
Serial.println(a2600game);
// Display Settings
Serial.print(F("CODE: "));
Serial.println(new2600mapper, HEX);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
} else {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
Expand Down
12 changes: 6 additions & 6 deletions Cart_Reader/5200.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ setrom:
new5200size = sizeROM.toInt() + a5200lo;
if (new5200size > a5200hi) {
Serial.println(F("SIZE NOT SUPPORTED"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
}
Expand Down Expand Up @@ -504,7 +504,7 @@ void checkStatus_5200() {
Serial.print(F("ROM SIZE: "));
Serial.print(a5200[a5200size]);
Serial.println(F("K"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down Expand Up @@ -776,12 +776,12 @@ bool getCartListInfo_5200() {
println_Msg(F("FAST CYCLE OFF"));
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("FAST CYCLE OFF"));
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
Serial.println(F("HOLD TO SELECT"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
while (readVals_5200(a5200game, a5200mm, a5200rr, a5200ll)) {
if (strcmp(a5200csvEND, a5200game) == 0) {
Expand Down Expand Up @@ -864,15 +864,15 @@ void checkCSV_5200() {
println_Msg(new5200size);
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("CART SELECTED"));
Serial.println(a5200game);
// Display Settings
Serial.print(F("CODE: M"));
Serial.print(new5200mapper);
Serial.print(F("/R"));
Serial.println(new5200size);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
} else {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
Expand Down
12 changes: 6 additions & 6 deletions Cart_Reader/7800.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ setrom:
new7800size = sizeROM.toInt() + a7800lo;
if (new7800size > a7800hi) {
Serial.println(F("SIZE NOT SUPPORTED"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
}
Expand Down Expand Up @@ -585,7 +585,7 @@ void checkStatus_7800() {
Serial.print(F("ROM SIZE: "));
Serial.print(A7800[a7800size]);
Serial.println(F("K"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down Expand Up @@ -894,12 +894,12 @@ bool getCartListInfo_7800() {
println_Msg(F("FAST CYCLE OFF"));
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("FAST CYCLE OFF"));
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
Serial.println(F("HOLD TO SELECT"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
while (readVals_7800(a7800game, a7800mm, a7800rr, a7800ll)) {
if (strcmp(a7800csvEND, a7800game) == 0) {
Expand Down Expand Up @@ -982,15 +982,15 @@ void checkCSV_7800() {
println_Msg(new7800size);
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("CART SELECTED"));
Serial.println(a7800game);
// Display Settings
Serial.print(F("CODE: M"));
Serial.print(new7800mapper);
Serial.print(F("/R"));
Serial.println(new7800size);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
} else {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
Expand Down
12 changes: 6 additions & 6 deletions Cart_Reader/ARC.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ setrom:
newarcsize = sizeROM.toInt() + arclo;
if (newarcsize > archi) {
Serial.println(F("SIZE NOT SUPPORTED"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
}
Expand Down Expand Up @@ -329,7 +329,7 @@ void checkStatus_ARC() {
Serial.print(F("CURRENT ROM SIZE: "));
Serial.print(ARC[arcsize]);
Serial.println(F("K"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down Expand Up @@ -440,12 +440,12 @@ bool getCartListInfo_ARC() {
println_Msg(F("FAST CYCLE OFF"));
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("FAST CYCLE OFF"));
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
Serial.println(F("HOLD TO SELECT"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
while (readVals_ARC(arcgame, arcrr, arcll)) {
if (strcmp(arccsvEND, arcgame) == 0) {
Expand Down Expand Up @@ -524,13 +524,13 @@ void checkCSV_ARC() {
println_Msg(newarcsize);
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("CART SELECTED"));
Serial.println(arcgame);
// Display Settings
Serial.print(F("CODE: R"));
Serial.println(newarcsize);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
} else {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
Expand Down
16 changes: 8 additions & 8 deletions Cart_Reader/C64.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ setmapper:
}
if (c64mapfound == false) {
Serial.println(F("MAPPER NOT SUPPORTED!"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
newc64mapper = 0;
goto setmapper;
}
Expand Down Expand Up @@ -967,7 +967,7 @@ setrom:
newc64size = sizeROM.toInt() + c64lo;
if (newc64size > c64hi) {
Serial.println(F("SIZE NOT SUPPORTED"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
}
Expand Down Expand Up @@ -1089,7 +1089,7 @@ setrom:
newc64port = sizeROM.toInt();
if (newc64port > 3) {
Serial.println(F("INVALID STATE"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
Serial.print(F("Port State = "));
Expand Down Expand Up @@ -1142,7 +1142,7 @@ void checkStatus_C64() {
Serial.println(F("K"));
Serial.print(F("CURRENT PORT STATE: "));
Setial.println(c64port);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down Expand Up @@ -1354,12 +1354,12 @@ bool getCartListInfo_C64() {
println_Msg(F("FAST CYCLE OFF"));
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("FAST CYCLE OFF"));
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
Serial.println(F("HOLD TO SELECT"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
while (readVals_C64(c64game, c64mm, c64rr, c64pp, c64ll)) {
if (strcmp(c64csvEND, c64game) == 0) {
Expand Down Expand Up @@ -1446,7 +1446,7 @@ void checkCSV_C64() {
print_Msg(newc64port);
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("CART SELECTED"));
Serial.println(c64game);
// Display Settings
Expand All @@ -1456,7 +1456,7 @@ void checkCSV_C64() {
Serial.print(newc64size);
Serial.print(F("/P"));
Serial.print(newc64port);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
} else {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
Expand Down
4 changes: 2 additions & 2 deletions Cart_Reader/COLV.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ setrom:
newcolsize = sizeROM.toInt() + collo;
if (newcolsize > colhi) {
Serial.println(F("SIZE NOT SUPPORTED"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
}
Expand Down Expand Up @@ -357,7 +357,7 @@ void checkStatus_COL() {
Serial.print(F("CURRENT ROM SIZE: "));
Serial.print(pgm_read_byte(&(COL[colsize])));
Serial.println(F("K"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down
10 changes: 5 additions & 5 deletions Cart_Reader/Cart_Reader.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,7 @@ void setup() {
# ifdef ENABLE_SERIAL
// Serial Begin
Serial.begin(9600);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("Cartridge Reader"));
Serial.println(F("2024 github.com/sanni"));
// LED Error
Expand Down Expand Up @@ -2426,17 +2426,17 @@ unsigned char question_box(const __FlashStringHelper* question, char answers[7][
// Serial Monitor
byte questionBox_Serial(const __FlashStringHelper* question, char answers[7][20], uint8_t num_answers, uint8_t default_choice) {
// Print menu to serial monitor
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
for (byte i = 0; i < num_answers; i++) {
Serial.print(i);
Serial.print(F(")"));
Serial.println(answers[i]);
}
// Wait for user input
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("Please browse pages with 'u'(up) and 'd'(down)"));
Serial.println(F("and enter a selection by typing a number(0-6): _ "));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
while (Serial.available() == 0) {
}

Expand Down Expand Up @@ -2468,7 +2468,7 @@ byte questionBox_Serial(const __FlashStringHelper* question, char answers[7][20]

// Print the received byte for validation e.g. in case of a different keyboard mapping
//Serial.println(incomingByte);
//Serial.println(FSTRING_EMPTY);
//Serial.println(FS(FSTRING_EMPTY));
return incomingByte;
}
#endif
Expand Down
12 changes: 6 additions & 6 deletions Cart_Reader/FAIRCHILD.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ setrom:
newfairchildsize = sizeROM.toInt() + fairchildlo;
if (newfairchildsize > fairchildhi) {
Serial.println(F("SIZE NOT SUPPORTED"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
}
Expand Down Expand Up @@ -665,7 +665,7 @@ void checkStatus_FAIRCHILD() {
Serial.print(F("CURRENT ROM SIZE: "));
Serial.print(FAIRCHILD[fairchildsize]);
Serial.println(F("K"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down Expand Up @@ -776,12 +776,12 @@ bool getCartListInfo_FAIRCHILD() {
println_Msg(F("FAST CYCLE OFF"));
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("FAST CYCLE OFF"));
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
Serial.println(F("HOLD TO SELECT"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
while (readVals_FAIRCHILD(fairchildgame, fairchildrr, fairchildll)) {
if (strcmp(fairchildcsvEND, fairchildgame) == 0) {
Expand Down Expand Up @@ -860,13 +860,13 @@ void checkCSV_FAIRCHILD() {
println_Msg(newfairchildsize);
display_Update();
#else
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
Serial.println(F("CART SELECTED"));
Serial.println(fairchildgame);
// Display Settings
Serial.print(F("CODE: R"));
Serial.println(newfairchildsize);
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
} else {
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
Expand Down
6 changes: 3 additions & 3 deletions Cart_Reader/INTV.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ setmapper:
}
if (intvmapfound == false) {
Serial.println(F("MAPPER NOT SUPPORTED!"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
newintvmapper = 0;
goto setmapper;
}
Expand Down Expand Up @@ -731,7 +731,7 @@ setrom:
newintvsize = sizeROM.toInt() + intvlo;
if (newintvsize > intvhi) {
Serial.println(F("SIZE NOT SUPPORTED"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
goto setrom;
}
}
Expand Down Expand Up @@ -773,7 +773,7 @@ void checkStatus_INTV() {
Serial.print(F("CURRENT ROM SIZE: "));
Serial.print(pgm_read_byte(&(INTV[intvsize])));
Serial.println(F("K"));
Serial.println(FSTRING_EMPTY);
Serial.println(FS(FSTRING_EMPTY));
#endif
}

Expand Down
Loading

0 comments on commit a86f140

Please sign in to comment.