From af63e7c40d375af71abb1ba15c1b11f14d2b56f1 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Sun, 26 May 2024 17:35:49 +0200 Subject: [PATCH] Fixed broken canvas in RT and AID ticker --- TEF6686_ESP32.ino | 1 + src/rds.cpp | 6 ++++++ src/rds.h | 1 + 3 files changed, 8 insertions(+) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 92b9a63..4339796 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -2934,6 +2934,7 @@ void ShowFreq(int mode) { ShowRDSLogo(false); if (!advancedRDS) { FullLineSprite.fillSprite(BackgroundColor); + FullLineSprite.drawLine(283, 0, 283, 19, FrameColor); FullLineSprite.pushSprite(36, 220); tft.fillCircle(314, 223, 2, GreyoutColor); tft.fillCircle(314, 234, 2, GreyoutColor); diff --git a/src/rds.cpp b/src/rds.cpp index d91a184..44b3bbe 100644 --- a/src/rds.cpp +++ b/src/rds.cpp @@ -805,6 +805,8 @@ void showRadioText() { FullLineSprite.setTextDatum(TL_DATUM); if (RDSstatus) FullLineSprite.setTextColor(RDSColor, RDSColorSmooth, false); else FullLineSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); FullLineSprite.drawString(RTString, xPos, 2); + FullLineSprite.fillRect(275, 0, 8, 19, BackgroundColor); + FullLineSprite.drawLine(283, 0, 283, 19, FrameColor); FullLineSprite.pushSprite(36, 220); } else { 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); FullLineSprite.drawString(RTString, xPos, 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); } rtticker = millis(); @@ -1077,6 +1081,7 @@ void ShowAFEON() { FullLineSprite.fillSprite(BackgroundColor); FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); FullLineSprite.drawString(AIDString, xPos, 2); + FullLineSprite.drawLine(283, 0, 283, 19, FrameColor); FullLineSprite.pushSprite(5, 220); } else { if (millis() - rtticker >= 5) { @@ -1094,6 +1099,7 @@ void ShowAFEON() { FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); FullLineSprite.drawString(AIDString, xPos, 2); FullLineSprite.drawString(AIDString, xPos + AIDWidth, 2); + FullLineSprite.drawLine(283, 0, 283, 19, FrameColor); FullLineSprite.pushSprite(5, 220); rtticker = millis(); } diff --git a/src/rds.h b/src/rds.h index 85d6d57..691052b 100644 --- a/src/rds.h +++ b/src/rds.h @@ -67,6 +67,7 @@ extern int BarSignificantColor; extern int BarInsignificantColor; extern int BWAutoColor; extern int BWAutoColorSmooth; +extern int FrameColor; extern int FreqColor; extern int FreqColorSmooth; extern int GreyoutColor;