Skip to content

Commit a86f140

Browse files
AncykerAncyker
committed
Follow up to/fix for e61ac41 
1 parent e61ac41 commit a86f140

14 files changed

+82
-82
lines changed

‎Cart_Reader/2600.ino

+5-5
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ void checkStatus_2600() {
631631
else
632632
Serial.print(a2600[a2600size]);
633633
Serial.println(F("K"));
634-
Serial.println(FSTRING_EMPTY);
634+
Serial.println(FS(FSTRING_EMPTY));
635635
#endif
636636
}
637637

@@ -956,12 +956,12 @@ bool getCartListInfo_2600() {
956956
println_Msg(F("FAST CYCLE OFF"));
957957
display_Update();
958958
#else
959-
Serial.println(FSTRING_EMPTY);
959+
Serial.println(FS(FSTRING_EMPTY));
960960
Serial.println(F("FAST CYCLE OFF"));
961961
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
962962
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
963963
Serial.println(F("HOLD TO SELECT"));
964-
Serial.println(FSTRING_EMPTY);
964+
Serial.println(FS(FSTRING_EMPTY));
965965
#endif
966966
while (readVals_ATARI(a2600game, a2600mm, a2600ll)) {
967967
if (strcmp(a2600csvEND, a2600game) == 0) {
@@ -1040,13 +1040,13 @@ void checkCSV_2600() {
10401040
println_Msg(new2600mapper, HEX);
10411041
display_Update();
10421042
#else
1043-
Serial.println(FSTRING_EMPTY);
1043+
Serial.println(FS(FSTRING_EMPTY));
10441044
Serial.println(F("CART SELECTED"));
10451045
Serial.println(a2600game);
10461046
// Display Settings
10471047
Serial.print(F("CODE: "));
10481048
Serial.println(new2600mapper, HEX);
1049-
Serial.println(FSTRING_EMPTY);
1049+
Serial.println(FS(FSTRING_EMPTY));
10501050
#endif
10511051
} else {
10521052
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))

‎Cart_Reader/5200.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ setrom:
450450
new5200size = sizeROM.toInt() + a5200lo;
451451
if (new5200size > a5200hi) {
452452
Serial.println(F("SIZE NOT SUPPORTED"));
453-
Serial.println(FSTRING_EMPTY);
453+
Serial.println(FS(FSTRING_EMPTY));
454454
goto setrom;
455455
}
456456
}
@@ -504,7 +504,7 @@ void checkStatus_5200() {
504504
Serial.print(F("ROM SIZE: "));
505505
Serial.print(a5200[a5200size]);
506506
Serial.println(F("K"));
507-
Serial.println(FSTRING_EMPTY);
507+
Serial.println(FS(FSTRING_EMPTY));
508508
#endif
509509
}
510510

@@ -776,12 +776,12 @@ bool getCartListInfo_5200() {
776776
println_Msg(F("FAST CYCLE OFF"));
777777
display_Update();
778778
#else
779-
Serial.println(FSTRING_EMPTY);
779+
Serial.println(FS(FSTRING_EMPTY));
780780
Serial.println(F("FAST CYCLE OFF"));
781781
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
782782
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
783783
Serial.println(F("HOLD TO SELECT"));
784-
Serial.println(FSTRING_EMPTY);
784+
Serial.println(FS(FSTRING_EMPTY));
785785
#endif
786786
while (readVals_5200(a5200game, a5200mm, a5200rr, a5200ll)) {
787787
if (strcmp(a5200csvEND, a5200game) == 0) {
@@ -864,15 +864,15 @@ void checkCSV_5200() {
864864
println_Msg(new5200size);
865865
display_Update();
866866
#else
867-
Serial.println(FSTRING_EMPTY);
867+
Serial.println(FS(FSTRING_EMPTY));
868868
Serial.println(F("CART SELECTED"));
869869
Serial.println(a5200game);
870870
// Display Settings
871871
Serial.print(F("CODE: M"));
872872
Serial.print(new5200mapper);
873873
Serial.print(F("/R"));
874874
Serial.println(new5200size);
875-
Serial.println(FSTRING_EMPTY);
875+
Serial.println(FS(FSTRING_EMPTY));
876876
#endif
877877
} else {
878878
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))

‎Cart_Reader/7800.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ setrom:
515515
new7800size = sizeROM.toInt() + a7800lo;
516516
if (new7800size > a7800hi) {
517517
Serial.println(F("SIZE NOT SUPPORTED"));
518-
Serial.println(FSTRING_EMPTY);
518+
Serial.println(FS(FSTRING_EMPTY));
519519
goto setrom;
520520
}
521521
}
@@ -585,7 +585,7 @@ void checkStatus_7800() {
585585
Serial.print(F("ROM SIZE: "));
586586
Serial.print(A7800[a7800size]);
587587
Serial.println(F("K"));
588-
Serial.println(FSTRING_EMPTY);
588+
Serial.println(FS(FSTRING_EMPTY));
589589
#endif
590590
}
591591

@@ -894,12 +894,12 @@ bool getCartListInfo_7800() {
894894
println_Msg(F("FAST CYCLE OFF"));
895895
display_Update();
896896
#else
897-
Serial.println(FSTRING_EMPTY);
897+
Serial.println(FS(FSTRING_EMPTY));
898898
Serial.println(F("FAST CYCLE OFF"));
899899
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
900900
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
901901
Serial.println(F("HOLD TO SELECT"));
902-
Serial.println(FSTRING_EMPTY);
902+
Serial.println(FS(FSTRING_EMPTY));
903903
#endif
904904
while (readVals_7800(a7800game, a7800mm, a7800rr, a7800ll)) {
905905
if (strcmp(a7800csvEND, a7800game) == 0) {
@@ -982,15 +982,15 @@ void checkCSV_7800() {
982982
println_Msg(new7800size);
983983
display_Update();
984984
#else
985-
Serial.println(FSTRING_EMPTY);
985+
Serial.println(FS(FSTRING_EMPTY));
986986
Serial.println(F("CART SELECTED"));
987987
Serial.println(a7800game);
988988
// Display Settings
989989
Serial.print(F("CODE: M"));
990990
Serial.print(new7800mapper);
991991
Serial.print(F("/R"));
992992
Serial.println(new7800size);
993-
Serial.println(FSTRING_EMPTY);
993+
Serial.println(FS(FSTRING_EMPTY));
994994
#endif
995995
} else {
996996
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))

‎Cart_Reader/ARC.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ setrom:
296296
newarcsize = sizeROM.toInt() + arclo;
297297
if (newarcsize > archi) {
298298
Serial.println(F("SIZE NOT SUPPORTED"));
299-
Serial.println(FSTRING_EMPTY);
299+
Serial.println(FS(FSTRING_EMPTY));
300300
goto setrom;
301301
}
302302
}
@@ -329,7 +329,7 @@ void checkStatus_ARC() {
329329
Serial.print(F("CURRENT ROM SIZE: "));
330330
Serial.print(ARC[arcsize]);
331331
Serial.println(F("K"));
332-
Serial.println(FSTRING_EMPTY);
332+
Serial.println(FS(FSTRING_EMPTY));
333333
#endif
334334
}
335335

@@ -440,12 +440,12 @@ bool getCartListInfo_ARC() {
440440
println_Msg(F("FAST CYCLE OFF"));
441441
display_Update();
442442
#else
443-
Serial.println(FSTRING_EMPTY);
443+
Serial.println(FS(FSTRING_EMPTY));
444444
Serial.println(F("FAST CYCLE OFF"));
445445
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
446446
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
447447
Serial.println(F("HOLD TO SELECT"));
448-
Serial.println(FSTRING_EMPTY);
448+
Serial.println(FS(FSTRING_EMPTY));
449449
#endif
450450
while (readVals_ARC(arcgame, arcrr, arcll)) {
451451
if (strcmp(arccsvEND, arcgame) == 0) {
@@ -524,13 +524,13 @@ void checkCSV_ARC() {
524524
println_Msg(newarcsize);
525525
display_Update();
526526
#else
527-
Serial.println(FSTRING_EMPTY);
527+
Serial.println(FS(FSTRING_EMPTY));
528528
Serial.println(F("CART SELECTED"));
529529
Serial.println(arcgame);
530530
// Display Settings
531531
Serial.print(F("CODE: R"));
532532
Serial.println(newarcsize);
533-
Serial.println(FSTRING_EMPTY);
533+
Serial.println(FS(FSTRING_EMPTY));
534534
#endif
535535
} else {
536536
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))

‎Cart_Reader/C64.ino

+8-8
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ setmapper:
849849
}
850850
if (c64mapfound == false) {
851851
Serial.println(F("MAPPER NOT SUPPORTED!"));
852-
Serial.println(FSTRING_EMPTY);
852+
Serial.println(FS(FSTRING_EMPTY));
853853
newc64mapper = 0;
854854
goto setmapper;
855855
}
@@ -967,7 +967,7 @@ setrom:
967967
newc64size = sizeROM.toInt() + c64lo;
968968
if (newc64size > c64hi) {
969969
Serial.println(F("SIZE NOT SUPPORTED"));
970-
Serial.println(FSTRING_EMPTY);
970+
Serial.println(FS(FSTRING_EMPTY));
971971
goto setrom;
972972
}
973973
}
@@ -1089,7 +1089,7 @@ setrom:
10891089
newc64port = sizeROM.toInt();
10901090
if (newc64port > 3) {
10911091
Serial.println(F("INVALID STATE"));
1092-
Serial.println(FSTRING_EMPTY);
1092+
Serial.println(FS(FSTRING_EMPTY));
10931093
goto setrom;
10941094
}
10951095
Serial.print(F("Port State = "));
@@ -1142,7 +1142,7 @@ void checkStatus_C64() {
11421142
Serial.println(F("K"));
11431143
Serial.print(F("CURRENT PORT STATE: "));
11441144
Setial.println(c64port);
1145-
Serial.println(FSTRING_EMPTY);
1145+
Serial.println(FS(FSTRING_EMPTY));
11461146
#endif
11471147
}
11481148

@@ -1354,12 +1354,12 @@ bool getCartListInfo_C64() {
13541354
println_Msg(F("FAST CYCLE OFF"));
13551355
display_Update();
13561356
#else
1357-
Serial.println(FSTRING_EMPTY);
1357+
Serial.println(FS(FSTRING_EMPTY));
13581358
Serial.println(F("FAST CYCLE OFF"));
13591359
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
13601360
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
13611361
Serial.println(F("HOLD TO SELECT"));
1362-
Serial.println(FSTRING_EMPTY);
1362+
Serial.println(FS(FSTRING_EMPTY));
13631363
#endif
13641364
while (readVals_C64(c64game, c64mm, c64rr, c64pp, c64ll)) {
13651365
if (strcmp(c64csvEND, c64game) == 0) {
@@ -1446,7 +1446,7 @@ void checkCSV_C64() {
14461446
print_Msg(newc64port);
14471447
display_Update();
14481448
#else
1449-
Serial.println(FSTRING_EMPTY);
1449+
Serial.println(FS(FSTRING_EMPTY));
14501450
Serial.println(F("CART SELECTED"));
14511451
Serial.println(c64game);
14521452
// Display Settings
@@ -1456,7 +1456,7 @@ void checkCSV_C64() {
14561456
Serial.print(newc64size);
14571457
Serial.print(F("/P"));
14581458
Serial.print(newc64port);
1459-
Serial.println(FSTRING_EMPTY);
1459+
Serial.println(FS(FSTRING_EMPTY));
14601460
#endif
14611461
} else {
14621462
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))

‎Cart_Reader/COLV.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ setrom:
321321
newcolsize = sizeROM.toInt() + collo;
322322
if (newcolsize > colhi) {
323323
Serial.println(F("SIZE NOT SUPPORTED"));
324-
Serial.println(FSTRING_EMPTY);
324+
Serial.println(FS(FSTRING_EMPTY));
325325
goto setrom;
326326
}
327327
}
@@ -357,7 +357,7 @@ void checkStatus_COL() {
357357
Serial.print(F("CURRENT ROM SIZE: "));
358358
Serial.print(pgm_read_byte(&(COL[colsize])));
359359
Serial.println(F("K"));
360-
Serial.println(FSTRING_EMPTY);
360+
Serial.println(FS(FSTRING_EMPTY));
361361
#endif
362362
}
363363

‎Cart_Reader/Cart_Reader.ino

+5-5
Original file line numberDiff line numberDiff line change
@@ -1808,7 +1808,7 @@ void setup() {
18081808
# ifdef ENABLE_SERIAL
18091809
// Serial Begin
18101810
Serial.begin(9600);
1811-
Serial.println(FSTRING_EMPTY);
1811+
Serial.println(FS(FSTRING_EMPTY));
18121812
Serial.println(F("Cartridge Reader"));
18131813
Serial.println(F("2024 github.com/sanni"));
18141814
// LED Error
@@ -2426,17 +2426,17 @@ unsigned char question_box(const __FlashStringHelper* question, char answers[7][
24262426
// Serial Monitor
24272427
byte questionBox_Serial(const __FlashStringHelper* question, char answers[7][20], uint8_t num_answers, uint8_t default_choice) {
24282428
// Print menu to serial monitor
2429-
Serial.println(FSTRING_EMPTY);
2429+
Serial.println(FS(FSTRING_EMPTY));
24302430
for (byte i = 0; i < num_answers; i++) {
24312431
Serial.print(i);
24322432
Serial.print(F(")"));
24332433
Serial.println(answers[i]);
24342434
}
24352435
// Wait for user input
2436-
Serial.println(FSTRING_EMPTY);
2436+
Serial.println(FS(FSTRING_EMPTY));
24372437
Serial.println(F("Please browse pages with 'u'(up) and 'd'(down)"));
24382438
Serial.println(F("and enter a selection by typing a number(0-6): _ "));
2439-
Serial.println(FSTRING_EMPTY);
2439+
Serial.println(FS(FSTRING_EMPTY));
24402440
while (Serial.available() == 0) {
24412441
}
24422442

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

24692469
// Print the received byte for validation e.g. in case of a different keyboard mapping
24702470
//Serial.println(incomingByte);
2471-
//Serial.println(FSTRING_EMPTY);
2471+
//Serial.println(FS(FSTRING_EMPTY));
24722472
return incomingByte;
24732473
}
24742474
#endif

‎Cart_Reader/FAIRCHILD.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ setrom:
632632
newfairchildsize = sizeROM.toInt() + fairchildlo;
633633
if (newfairchildsize > fairchildhi) {
634634
Serial.println(F("SIZE NOT SUPPORTED"));
635-
Serial.println(FSTRING_EMPTY);
635+
Serial.println(FS(FSTRING_EMPTY));
636636
goto setrom;
637637
}
638638
}
@@ -665,7 +665,7 @@ void checkStatus_FAIRCHILD() {
665665
Serial.print(F("CURRENT ROM SIZE: "));
666666
Serial.print(FAIRCHILD[fairchildsize]);
667667
Serial.println(F("K"));
668-
Serial.println(FSTRING_EMPTY);
668+
Serial.println(FS(FSTRING_EMPTY));
669669
#endif
670670
}
671671

@@ -776,12 +776,12 @@ bool getCartListInfo_FAIRCHILD() {
776776
println_Msg(F("FAST CYCLE OFF"));
777777
display_Update();
778778
#else
779-
Serial.println(FSTRING_EMPTY);
779+
Serial.println(FS(FSTRING_EMPTY));
780780
Serial.println(F("FAST CYCLE OFF"));
781781
Serial.println(F("PRESS BUTTON TO STEP FORWARD"));
782782
Serial.println(F("DOUBLE CLICK TO STEP BACK"));
783783
Serial.println(F("HOLD TO SELECT"));
784-
Serial.println(FSTRING_EMPTY);
784+
Serial.println(FS(FSTRING_EMPTY));
785785
#endif
786786
while (readVals_FAIRCHILD(fairchildgame, fairchildrr, fairchildll)) {
787787
if (strcmp(fairchildcsvEND, fairchildgame) == 0) {
@@ -860,13 +860,13 @@ void checkCSV_FAIRCHILD() {
860860
println_Msg(newfairchildsize);
861861
display_Update();
862862
#else
863-
Serial.println(FSTRING_EMPTY);
863+
Serial.println(FS(FSTRING_EMPTY));
864864
Serial.println(F("CART SELECTED"));
865865
Serial.println(fairchildgame);
866866
// Display Settings
867867
Serial.print(F("CODE: R"));
868868
Serial.println(newfairchildsize);
869-
Serial.println(FSTRING_EMPTY);
869+
Serial.println(FS(FSTRING_EMPTY));
870870
#endif
871871
} else {
872872
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))

‎Cart_Reader/INTV.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ setmapper:
614614
}
615615
if (intvmapfound == false) {
616616
Serial.println(F("MAPPER NOT SUPPORTED!"));
617-
Serial.println(FSTRING_EMPTY);
617+
Serial.println(FS(FSTRING_EMPTY));
618618
newintvmapper = 0;
619619
goto setmapper;
620620
}
@@ -731,7 +731,7 @@ setrom:
731731
newintvsize = sizeROM.toInt() + intvlo;
732732
if (newintvsize > intvhi) {
733733
Serial.println(F("SIZE NOT SUPPORTED"));
734-
Serial.println(FSTRING_EMPTY);
734+
Serial.println(FS(FSTRING_EMPTY));
735735
goto setrom;
736736
}
737737
}
@@ -773,7 +773,7 @@ void checkStatus_INTV() {
773773
Serial.print(F("CURRENT ROM SIZE: "));
774774
Serial.print(pgm_read_byte(&(INTV[intvsize])));
775775
Serial.println(F("K"));
776-
Serial.println(FSTRING_EMPTY);
776+
Serial.println(FS(FSTRING_EMPTY));
777777
#endif
778778
}
779779

0 commit comments

Comments
 (0)