mirror of
https://github.com/sanni/cartreader.git
synced 2024-11-10 23:15:08 +01:00
Follow up to/fix for e61ac414d8
This commit is contained in:
parent
e61ac414d8
commit
a86f140198
@ -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
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
@ -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))
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
@ -864,7 +864,7 @@ 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
|
||||
@ -872,7 +872,7 @@ void checkCSV_5200() {
|
||||
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))
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
@ -982,7 +982,7 @@ 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
|
||||
@ -990,7 +990,7 @@ void checkCSV_7800() {
|
||||
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))
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
@ -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))
|
||||
|
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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 = "));
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
@ -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
|
||||
@ -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))
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
@ -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) {
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
@ -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))
|
||||
|
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
|
@ -994,7 +994,7 @@ setmapper:
|
||||
}
|
||||
if (msxmapfound == false) {
|
||||
Serial.println(F("MAPPER NOT SUPPORTED!"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
newmsxmapper = 0;
|
||||
goto setmapper;
|
||||
}
|
||||
@ -1137,13 +1137,13 @@ setrom:
|
||||
if (msxmapper == 11) { // PAC/FM-PAC 0K/64K
|
||||
if ((newmsxromsize > 0) && (newmsxromsize < 4)) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setrom;
|
||||
}
|
||||
}
|
||||
if (newmsxsize > msxhi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setrom;
|
||||
}
|
||||
}
|
||||
@ -1272,13 +1272,13 @@ setram:
|
||||
if (msxmapper == 7) { // Koei 8K/32K
|
||||
if (newmsxramsize == 3) { // 16K
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setram;
|
||||
}
|
||||
}
|
||||
if (newmsxramsize > msxramhi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setram;
|
||||
}
|
||||
}
|
||||
@ -1341,7 +1341,7 @@ void checkStatus_MSX() {
|
||||
Serial.print(F("CURRENT RAM SIZE: "));
|
||||
Serial.print(MSXRAM[msxramsize]);
|
||||
Serial.println(F("K"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1521,12 +1521,12 @@ bool getCartListInfo_MSX() {
|
||||
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_MSX(msxgame, msxmm, msxrr, msxss, msxll)) {
|
||||
if (strcmp(msxcsvEND, msxgame) == 0) {
|
||||
@ -1613,7 +1613,7 @@ void checkCSV_MSX() {
|
||||
println_Msg(newmsxramsize);
|
||||
display_Update();
|
||||
#else
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
Serial.println(F("CART SELECTED"));
|
||||
Serial.println(msxgame);
|
||||
// Display Settings
|
||||
@ -1623,7 +1623,7 @@ void checkCSV_MSX() {
|
||||
Serial.print(newmsxsize);
|
||||
Serial.print(F("/S"));
|
||||
Serial.println(newmsxramsize);
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
} else {
|
||||
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
|
||||
|
@ -1399,11 +1399,11 @@ setmapper:
|
||||
Serial.print("]");
|
||||
if (i < mapcount - 1) {
|
||||
if ((i != 0) && ((i + 1) % 10 == 0))
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
else
|
||||
Serial.print(F("\t"));
|
||||
} else
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
}
|
||||
Serial.print(F("Enter Mapper: "));
|
||||
while (Serial.available() == 0) {}
|
||||
@ -1418,7 +1418,7 @@ setmapper:
|
||||
}
|
||||
if (mapfound == false) {
|
||||
Serial.println(F("MAPPER NOT SUPPORTED!"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
newmapper = 0;
|
||||
goto setmapper;
|
||||
}
|
||||
@ -1551,7 +1551,7 @@ setprg:
|
||||
newprgsize = sizePRG.toInt() + prglo;
|
||||
if (newprgsize > prghi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setprg;
|
||||
}
|
||||
}
|
||||
@ -1671,7 +1671,7 @@ setchr:
|
||||
newchrsize = sizeCHR.toInt() + chrlo;
|
||||
if (newchrsize > chrhi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setchr;
|
||||
}
|
||||
}
|
||||
@ -1880,7 +1880,7 @@ setram:
|
||||
newramsize = sizeRAM.toInt() + ramlo;
|
||||
if (newramsize > ramhi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setram;
|
||||
}
|
||||
}
|
||||
@ -1893,7 +1893,7 @@ setram:
|
||||
sizeEEP = pgm_read_byte(&(RAM[newramsize])) * 16;
|
||||
Serial.print(sizeEEP);
|
||||
Serial.println(F("B"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
} else if (mapper == 19) {
|
||||
Serial.print(F("RAM Size = "));
|
||||
if (newramsize == 2)
|
||||
@ -1902,12 +1902,12 @@ setram:
|
||||
Serial.print(pgm_read_byte(&(RAM[newramsize])));
|
||||
Serial.println(F("K"));
|
||||
}
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
} else if (mapper == 80) {
|
||||
Serial.print(F("RAM Size = "));
|
||||
Serial.print(pgm_read_byte(&(RAM[newramsize])) * 16);
|
||||
Serial.println(F("B"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
} else {
|
||||
Serial.print(F("RAM Size = "));
|
||||
if (mapper == 0)
|
||||
@ -1917,7 +1917,7 @@ setram:
|
||||
else
|
||||
Serial.print(pgm_read_byte(&(RAM[newramsize])));
|
||||
Serial.println(F("K"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
}
|
||||
#endif
|
||||
EEPROM_writeAnything(10, newramsize);
|
||||
@ -5019,7 +5019,7 @@ void writeFLASH() {
|
||||
#else
|
||||
Serial.print(F("*"));
|
||||
if ((i != 0) && ((i + 1) % 16 == 0))
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
}
|
||||
myFile.close();
|
||||
|
@ -376,7 +376,7 @@ setrom:
|
||||
newody2size = sizeROM.toInt() + ody2lo;
|
||||
if (newody2size > ody2hi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setrom;
|
||||
}
|
||||
}
|
||||
@ -418,7 +418,7 @@ void checkStatus_ODY2() {
|
||||
Serial.print(F("CURRENT ROM SIZE: "));
|
||||
Serial.print(ODY2[ody2size]);
|
||||
Serial.println(F("K"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -532,12 +532,12 @@ bool getCartListInfo_ODY2() {
|
||||
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_ODY2(ody2game, ody2mm, ody2rr, ody2ll)) {
|
||||
if (strcmp(ody2csvEND, ody2game) == 0) {
|
||||
@ -620,7 +620,7 @@ void checkCSV_ODY2() {
|
||||
println_Msg(newody2size);
|
||||
display_Update();
|
||||
#else
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
Serial.println(F("CART SELECTED"));
|
||||
Serial.println(ody2game);
|
||||
// Display Settings
|
||||
@ -628,7 +628,7 @@ void checkCSV_ODY2() {
|
||||
Serial.print(newody2mapper);
|
||||
Serial.print(F("/R"));
|
||||
Serial.println(newody2size);
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
} else {
|
||||
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
|
||||
|
@ -353,7 +353,7 @@ setrom:
|
||||
newvectrexsize = sizeROM.toInt() + vectrexlo;
|
||||
if (newvectrexsize > vectrexhi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setrom;
|
||||
}
|
||||
}
|
||||
@ -386,7 +386,7 @@ void checkStatus_VECTREX() {
|
||||
Serial.print(F("ROM SIZE: "));
|
||||
Serial.print(VECTREX[vectrexsize]);
|
||||
Serial.println(F("KB"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -497,12 +497,12 @@ bool getCartListInfo_VECTREX() {
|
||||
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_VECTREX(vectrexgame, vectrexrr, vectrexll)) {
|
||||
if (strcmp(vectrexcsvEND, vectrexgame) == 0) {
|
||||
@ -581,13 +581,13 @@ void checkCSV_VECTREX() {
|
||||
println_Msg(newvectrexsize);
|
||||
display_Update();
|
||||
#else
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
Serial.println(F("CART SELECTED"));
|
||||
Serial.println(vectrexgame);
|
||||
// Display Settings
|
||||
Serial.print(F("CODE: R"));
|
||||
Serial.println(newvectrexsize);
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
} else {
|
||||
#if (defined(ENABLE_OLED) || defined(ENABLE_LCD))
|
||||
|
@ -338,7 +338,7 @@ setrom:
|
||||
newwsvsize = sizeROM.toInt() + wsvlo;
|
||||
if (newwsvsize > wsvhi) {
|
||||
Serial.println(F("SIZE NOT SUPPORTED"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
goto setrom;
|
||||
}
|
||||
}
|
||||
@ -371,7 +371,7 @@ void checkStatus_WSV() {
|
||||
Serial.print(F("CURRENT ROM SIZE: "));
|
||||
Serial.print(pgm_read_word(&(WSV[wsvsize])));
|
||||
Serial.println(F("K"));
|
||||
Serial.println(FSTRING_EMPTY);
|
||||
Serial.println(FS(FSTRING_EMPTY));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user