kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'main' into New_Model_DP_666

Browse Source
This commit is contained in:
Leon
2024-05-07 20:46:03 +08:00
parent 83c7b6dfd1 18f0597cee
commit 018141c2c9
4 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui.cpp
+9 -10
View File
@@ -1412,7 +1412,6 @@ void BuildAdvancedRDS() {
afpage = false;
afpagenr = 1;
advancedRDS = true;
ScreensaverTimerSet(OFF);
tft.fillScreen(BackgroundColor);
tft.drawRect(0, 0, 320, 240, FrameColor);
@@ -1859,13 +1858,13 @@ void MenuUp() {
OneBigLineSprite.setTextDatum(TL_DATUM);
OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
OneBigLineSprite.drawString("MHz", 155, 0);
OneBigLineSprite.drawString("MHz", 175, 0);
OneBigLineSprite.setTextDatum(TR_DATUM);
OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
if (spispeed == 7) {
OneBigLineSprite.drawString(myLanguage[language][86], 140, 0);
OneBigLineSprite.drawString(myLanguage[language][86], 160, 0);
} else {
OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 140, 0);
OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 160, 0);
}
OneBigLineSprite.pushSprite(24, 118);
@@ -2682,13 +2681,13 @@ void MenuDown() {
if (spispeed > SPI_SPEED_COUNT - 1) spispeed = SPI_SPEED_COUNT - 1;
OneBigLineSprite.setTextDatum(TL_DATUM);
OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
OneBigLineSprite.drawString("MHz", 155, 0);
OneBigLineSprite.drawString("MHz", 175, 0);
OneBigLineSprite.setTextDatum(TR_DATUM);
OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
if (spispeed == 7) {
OneBigLineSprite.drawString(myLanguage[language][86], 140, 0);
OneBigLineSprite.drawString(myLanguage[language][86], 160, 0);
} else {
OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 140, 0);
OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 160, 0);
}
OneBigLineSprite.pushSprite(24, 118);
@@ -3571,13 +3570,13 @@ void DoMenu() {
OneBigLineSprite.setTextDatum(TL_DATUM);
OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
OneBigLineSprite.drawString("MHz", 155, 0);
OneBigLineSprite.drawString("MHz", 175, 0);
OneBigLineSprite.setTextDatum(TR_DATUM);
OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
if (spispeed == 7) {
OneBigLineSprite.drawString(myLanguage[language][86], 140, 0);
OneBigLineSprite.drawString(myLanguage[language][86], 160, 0);
} else {
OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 140, 0);
OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 160, 0);
}
OneBigLineSprite.pushSprite(24, 118);
break;
src/language.h
+1 -1
View File
@@ -996,7 +996,7 @@ static const char* const myLanguage[18][224] PROGMEM = {
"KAMIA", // 83
"Έκδοση λογισμικού", // 84
"Γραμματοσειρά\nσυχνότητας", // 85
"Auto", // 86
"Αυτόματο", // 86
"Μη διαθέσιμο AF", // 87
"Μη διαθέσιμο EON", // 88
"Μη διαθέσιμο RT+", // 89
src/rds.cpp
+4 -4
View File
@@ -82,7 +82,7 @@ void ShowAdvancedRDS() {
hasafold = radio.rds.hasAF;
}
if (millis() - afticker >= 15) {
if (millis() - afticker >= 5) {
if (radio.rds.hasAF) {
if (afstring.length() != afstringlengthold) {
afstringWidth = afstring.length() * charwidth;
@@ -119,7 +119,7 @@ void ShowAdvancedRDS() {
haseonold = radio.rds.hasEON;
}
if (millis() - eonticker >= 15) {
if (millis() - eonticker >= 5) {
if (radio.rds.hasEON) {
if (eonstring.length() != eonstringlengthold) {
@@ -157,7 +157,7 @@ void ShowAdvancedRDS() {
hasrtplusold = radio.rds.hasRDSplus;
}
if (millis() - rtplusticker >= 15) {
if (millis() - rtplusticker >= 5) {
if (radio.rds.hasRDSplus) {
if (rtplusstring.length() != rtplusstringlengthold) {
rtplusstringWidth = rtplusstring.length() * charwidth;
@@ -753,7 +753,7 @@ void showRadioText() {
RadiotextSprite.drawString(radio.rds.stationText + " " + radio.rds.stationText32, xPos, 2);
RadiotextSprite.pushSprite(36, 220);
} else {
if (millis() - rtticker >= 15) {
if (millis() - rtticker >= (advancedRDS ? 5 : 15)) {
if (xPos == 0) {
if (millis() - rttickerhold >= 1000) {
xPos --;