diff --git a/src/gui.cpp b/src/gui.cpp index 354a435..c517288 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -1753,7 +1753,7 @@ void ShowOneButton(byte position, byte item, bool selected) { case CONNECTIVITY: PSSprite.setTextDatum(TC_DATUM); PSSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); - PSSprite.drawString(shortLine(removeNewline(myLanguage[language][51] + (wifi ? " IP: " + String(WiFi.localIP().toString()) : ""))), 75, 1); + PSSprite.drawString(shortLine(removeNewline(wifi ? " IP: " + String(WiFi.localIP().toString()) : myLanguage[language][51])), 75, 1); PSSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); PSSprite.drawString((wifi ? myLanguage[language][42] : myLanguage[language][30]), 75, 15); @@ -1980,7 +1980,7 @@ void ShowOneButton(byte position, byte item, bool selected) { PSSprite.drawString(shortLine(removeNewline(myLanguage[language][58])), 75, 1); PSSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); - PSSprite.drawString((wifi ? String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC) : "-"), 75, 1); + PSSprite.drawString((wifi ? String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC) : "-"), 75, 15); break; case DXMODE: diff --git a/src/rds.cpp b/src/rds.cpp index b7652fa..06a3e85 100644 --- a/src/rds.cpp +++ b/src/rds.cpp @@ -723,8 +723,8 @@ void showPS() { } else { xPos5 = 0; PSSprite.fillSprite(BackgroundColor); - length12 = PSSprite.textWidth(radio.rds.stationName.substring(0, 2)) - 2; - length34 = PSSprite.textWidth(radio.rds.stationName.substring(2, 4)) + length12 + 2; + length12 = PSSprite.textWidth(radio.rds.stationName.substring(0, 2)); + length34 = PSSprite.textWidth(radio.rds.stationName.substring(2, 4)) + length12; length56 = PSSprite.textWidth(radio.rds.stationName.substring(4, 6)) + length34; if (PSold.substring(0, 2) != radio.rds.stationName.substring(0, 2)) ps12errorold = true;