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

Fixed flickering A/B indicator on main screen

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-26 21:13:41 +02:00
parent 49999bf16a
commit 49ff3d964e
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rds.cpp
+19 -11
View File
@@ -810,6 +810,15 @@ void showRadioText() {
FullLineSprite.drawString(RTString, xPos, 2); FullLineSprite.drawString(RTString, xPos, 2);
FullLineSprite.fillRect(275, 0, 8, 19, BackgroundColor); FullLineSprite.fillRect(275, 0, 8, 19, BackgroundColor);
FullLineSprite.drawLine(283, 0, 283, 19, FrameColor); FullLineSprite.drawLine(283, 0, 283, 19, FrameColor);
if (radio.rds.hasRT) {
if (radio.rds.rtAB) {
FullLineSprite.fillCircle(278, 3, 2, GreyoutColor);
FullLineSprite.fillCircle(278, 14, 2, InsignificantColor);
} else {
FullLineSprite.fillCircle(278, 3, 2, InsignificantColor);
FullLineSprite.fillCircle(278, 14, 2, GreyoutColor);
}
}
FullLineSprite.pushSprite(36, 220); FullLineSprite.pushSprite(36, 220);
} else { } else {
if (millis() - rtticker >= (advancedRDS ? 5 : 15)) { if (millis() - rtticker >= (advancedRDS ? 5 : 15)) {
@@ -839,6 +848,15 @@ void showRadioText() {
FullLineSprite.drawString(RTString, xPos + RadiotextWidth, 2); FullLineSprite.drawString(RTString, xPos + RadiotextWidth, 2);
FullLineSprite.fillRect(275, 0, 8, 19, BackgroundColor); FullLineSprite.fillRect(275, 0, 8, 19, BackgroundColor);
FullLineSprite.drawLine(283, 0, 283, 19, FrameColor); FullLineSprite.drawLine(283, 0, 283, 19, FrameColor);
if (radio.rds.hasRT) {
if (radio.rds.rtAB) {
FullLineSprite.fillCircle(278, 3, 2, GreyoutColor);
FullLineSprite.fillCircle(278, 14, 2, InsignificantColor);
} else {
FullLineSprite.fillCircle(278, 3, 2, InsignificantColor);
FullLineSprite.fillCircle(278, 14, 2, GreyoutColor);
}
}
FullLineSprite.pushSprite(36, 220); FullLineSprite.pushSprite(36, 220);
} }
rtticker = millis(); rtticker = millis();
@@ -846,16 +864,7 @@ void showRadioText() {
} }
} }
if (radio.rds.hasRT) { if (radio.rds.hasRT && advancedRDS) {
if (!advancedRDS) {
if (radio.rds.rtAB) {
tft.fillCircle(314, 223, 2, GreyoutColor);
tft.fillCircle(314, 234, 2, InsignificantColor);
} else {
tft.fillCircle(314, 223, 2, InsignificantColor);
tft.fillCircle(314, 234, 2, GreyoutColor);
}
} else {
if (radio.rds.rtAB) { if (radio.rds.rtAB) {
tft.fillCircle(203, 223, 2, GreyoutColor); tft.fillCircle(203, 223, 2, GreyoutColor);
tft.fillCircle(203, 234, 2, InsignificantColor); tft.fillCircle(203, 234, 2, InsignificantColor);
@@ -865,7 +874,6 @@ void showRadioText() {
} }
} }
} }
}
if (RTold != RTString) { if (RTold != RTString) {
RadiotextWidth = (advancedRDS ? RDSSprite.textWidth(RTString) : FullLineSprite.textWidth(RTString)); RadiotextWidth = (advancedRDS ? RDSSprite.textWidth(RTString) : FullLineSprite.textWidth(RTString));