V7.2: LCD bugfix

This commit is contained in:
sanni 2021-11-17 20:13:24 +01:00
parent 2d165f93a4
commit 21736a241a
4 changed files with 32 additions and 7 deletions

View File

@ -1036,7 +1036,7 @@ void getCartInfo_MD() {
println_Msg(F(" ")); println_Msg(F(" "));
// Wait for user input // Wait for user input
#ifdef enable_OLED #if defined(enable_LCD) || defined(enable_OLED)
println_Msg(F("Press Button...")); println_Msg(F("Press Button..."));
display_Update(); display_Update();
wait(); wait();

View File

@ -1126,7 +1126,7 @@ unsigned char* getNES20HeaderBytesFromDatabaseRow(const char* crctest) {
Config Functions Config Functions
*****************************************/ *****************************************/
void setMapper() { void setMapper() {
#ifdef enable_OLED #if defined(enable_LCD) || defined(enable_OLED)
chooseMapper: chooseMapper:
// Read stored mapper // Read stored mapper
EEPROM_readAnything(7, newmapper); EEPROM_readAnything(7, newmapper);
@ -1152,6 +1152,7 @@ chooseMapper:
display.println(""); display.println("");
display.println(F("Press to Change")); display.println(F("Press to Change"));
display.println(F("Hold to Select")); display.println(F("Hold to Select"));
#ifdef enable_OLED
if (digit == 0) { if (digit == 0) {
display.drawLine(20, 30, 30, 30, WHITE); display.drawLine(20, 30, 30, 30, WHITE);
display.drawLine(40, 30, 50, 30, BLACK); display.drawLine(40, 30, 50, 30, BLACK);
@ -1167,6 +1168,30 @@ chooseMapper:
display.drawLine(40, 30, 50, 30, BLACK); display.drawLine(40, 30, 50, 30, BLACK);
display.drawLine(60, 30, 70, 30, WHITE); display.drawLine(60, 30, 70, 30, WHITE);
} }
#else if enable_LCD
if (digit == 0) {
display.setDrawColor(1);
display.drawLine(20, 30, 30, 30);
display.setDrawColor(0);
display.drawLine(40, 30, 50, 30);
display.drawLine(60, 30, 70, 30);
}
else if (digit == 1) {
display.setDrawColor(0);
display.drawLine(20, 30, 30, 30);
display.setDrawColor(1);
display.drawLine(40, 30, 50, 30);
display.setDrawColor(0);
display.drawLine(60, 30, 70, 30);
}
else if (digit == 2) {
display.setDrawColor(0);
display.drawLine(20, 30, 30, 30);
display.drawLine(40, 30, 50, 30);
display.setDrawColor(1);
display.drawLine(60, 30, 70, 30);
}
#endif
/* Check Button /* Check Button
1 click 1 click
2 doubleClick 2 doubleClick
@ -1316,7 +1341,7 @@ void checkMapperSize() {
} }
void setPRGSize() { void setPRGSize() {
#ifdef enable_OLED #if defined(enable_LCD) || defined(enable_OLED)
display_Clear(); display_Clear();
if (prglo == prghi) if (prglo == prghi)
newprgsize = prglo; newprgsize = prglo;
@ -1391,7 +1416,7 @@ setprg:
} }
void setCHRSize() { void setCHRSize() {
#ifdef enable_OLED #if defined(enable_LCD) || defined(enable_OLED)
display_Clear(); display_Clear();
if (chrlo == chrhi) if (chrlo == chrhi)
newchrsize = chrlo; newchrsize = chrlo;
@ -1465,7 +1490,7 @@ setchr:
} }
void setRAMSize() { void setRAMSize() {
#ifdef enable_OLED #if defined(enable_LCD) || defined(enable_OLED)
display_Clear(); display_Clear();
if (ramlo == ramhi) if (ramlo == ramhi)
newramsize = ramlo; newramsize = ramlo;

View File

@ -376,7 +376,7 @@ void getCartInfo_SMS() {
} }
// Wait for user input // Wait for user input
#ifdef enable_OLED #if defined(enable_LCD) || defined(enable_OLED)
println_Msg(F("Press Button...")); println_Msg(F("Press Button..."));
display_Update(); display_Update();
wait(); wait();

View File

@ -787,7 +787,7 @@ void getCartInfo_SNES() {
display_Update(); display_Update();
// Wait for user input // Wait for user input
#ifdef enable_OLED #if defined(enable_LCD) || defined(enable_OLED)
println_Msg(F(" ")); println_Msg(F(" "));
println_Msg(F(" ")); println_Msg(F(" "));
println_Msg(F("Press Button...")); println_Msg(F("Press Button..."));