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

Fixed broken canvas in RT and AID ticker

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-26 17:35:49 +02:00
parent 5254bfd348
commit af63e7c40d
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+1
View File
@@ -2934,6 +2934,7 @@ void ShowFreq(int mode) {
ShowRDSLogo(false); ShowRDSLogo(false);
if (!advancedRDS) { if (!advancedRDS) {
FullLineSprite.fillSprite(BackgroundColor); FullLineSprite.fillSprite(BackgroundColor);
FullLineSprite.drawLine(283, 0, 283, 19, FrameColor);
FullLineSprite.pushSprite(36, 220); FullLineSprite.pushSprite(36, 220);
tft.fillCircle(314, 223, 2, GreyoutColor); tft.fillCircle(314, 223, 2, GreyoutColor);
tft.fillCircle(314, 234, 2, GreyoutColor); tft.fillCircle(314, 234, 2, GreyoutColor);
src/rds.cpp
+6
View File
@@ -805,6 +805,8 @@ void showRadioText() {
FullLineSprite.setTextDatum(TL_DATUM); FullLineSprite.setTextDatum(TL_DATUM);
if (RDSstatus) FullLineSprite.setTextColor(RDSColor, RDSColorSmooth, false); else FullLineSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); if (RDSstatus) FullLineSprite.setTextColor(RDSColor, RDSColorSmooth, false); else FullLineSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
FullLineSprite.drawString(RTString, xPos, 2); FullLineSprite.drawString(RTString, xPos, 2);
FullLineSprite.fillRect(275, 0, 8, 19, BackgroundColor);
FullLineSprite.drawLine(283, 0, 283, 19, FrameColor);
FullLineSprite.pushSprite(36, 220); FullLineSprite.pushSprite(36, 220);
} else { } else {
if (millis() - rtticker >= (advancedRDS ? 5 : 15)) { if (millis() - rtticker >= (advancedRDS ? 5 : 15)) {
@@ -832,6 +834,8 @@ void showRadioText() {
if (RDSstatus) FullLineSprite.setTextColor(RDSColor, RDSColorSmooth, false); else FullLineSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); if (RDSstatus) FullLineSprite.setTextColor(RDSColor, RDSColorSmooth, false); else FullLineSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
FullLineSprite.drawString(RTString, xPos, 2); FullLineSprite.drawString(RTString, xPos, 2);
FullLineSprite.drawString(RTString, xPos + RadiotextWidth, 2); FullLineSprite.drawString(RTString, xPos + RadiotextWidth, 2);
FullLineSprite.fillRect(275, 0, 8, 19, BackgroundColor);
FullLineSprite.drawLine(283, 0, 283, 19, FrameColor);
FullLineSprite.pushSprite(36, 220); FullLineSprite.pushSprite(36, 220);
} }
rtticker = millis(); rtticker = millis();
@@ -1077,6 +1081,7 @@ void ShowAFEON() {
FullLineSprite.fillSprite(BackgroundColor); FullLineSprite.fillSprite(BackgroundColor);
FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
FullLineSprite.drawString(AIDString, xPos, 2); FullLineSprite.drawString(AIDString, xPos, 2);
FullLineSprite.drawLine(283, 0, 283, 19, FrameColor);
FullLineSprite.pushSprite(5, 220); FullLineSprite.pushSprite(5, 220);
} else { } else {
if (millis() - rtticker >= 5) { if (millis() - rtticker >= 5) {
@@ -1094,6 +1099,7 @@ void ShowAFEON() {
FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
FullLineSprite.drawString(AIDString, xPos, 2); FullLineSprite.drawString(AIDString, xPos, 2);
FullLineSprite.drawString(AIDString, xPos + AIDWidth, 2); FullLineSprite.drawString(AIDString, xPos + AIDWidth, 2);
FullLineSprite.drawLine(283, 0, 283, 19, FrameColor);
FullLineSprite.pushSprite(5, 220); FullLineSprite.pushSprite(5, 220);
rtticker = millis(); rtticker = millis();
} }
src/rds.h
+1
View File
@@ -67,6 +67,7 @@ extern int BarSignificantColor;
extern int BarInsignificantColor; extern int BarInsignificantColor;
extern int BWAutoColor; extern int BWAutoColor;
extern int BWAutoColorSmooth; extern int BWAutoColorSmooth;
extern int FrameColor;
extern int FreqColor; extern int FreqColor;
extern int FreqColorSmooth; extern int FreqColorSmooth;
extern int GreyoutColor; extern int GreyoutColor;