From 97c621f7055cab9cef918549381d2376c84f182f Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Sun, 26 May 2024 18:17:10 +0200 Subject: [PATCH] Removed smoothing from stereologo --- TEF6686_ESP32.ino | 64 +++++++++++++++++++++++------------------------ src/gui.cpp | 24 +++++++++--------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 4339796..9d74658 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -2152,23 +2152,23 @@ void BWButtonPress() { void doStereoToggle() { if (StereoToggle) { if (!screenmute) { - tft.drawSmoothCircle(66, 15, 10, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 9, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 10, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 9, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); - tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); + tft.drawCircle(66, 15, 10, BackgroundColor); + tft.drawCircle(66, 15, 9, BackgroundColor); + tft.drawCircle(76, 15, 10, BackgroundColor); + tft.drawCircle(76, 15, 9, BackgroundColor); + tft.drawCircle(71, 15, 10, SecondaryColor); + tft.drawCircle(71, 15, 9, SecondaryColor); } radio.setMono(true); StereoToggle = false; } else { if (!screenmute) { - tft.drawSmoothCircle(71, 15, 10, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(71, 15, 9, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); + tft.drawCircle(71, 15, 10, BackgroundColor); + tft.drawCircle(71, 15, 9, BackgroundColor); + tft.drawCircle(66, 15, 10, GreyoutColor); + tft.drawCircle(66, 15, 9, GreyoutColor); + tft.drawCircle(76, 15, 10, GreyoutColor); + tft.drawCircle(76, 15, 9, GreyoutColor); } radio.setMono(false); Stereostatusold = false; @@ -2761,20 +2761,20 @@ void DoMemoryPosTune() { StereoToggle = presets[memorypos].ms; if (!StereoToggle) { Stereostatusold = false; - tft.drawSmoothCircle(66, 15, 10, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 9, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 10, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 9, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); - tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); + tft.drawCircle(66, 15, 10, BackgroundColor); + tft.drawCircle(66, 15, 9, BackgroundColor); + tft.drawCircle(76, 15, 10, BackgroundColor); + tft.drawCircle(76, 15, 9, BackgroundColor); + tft.drawCircle(71, 15, 10, SecondaryColor); + tft.drawCircle(71, 15, 9, SecondaryColor); } else { Stereostatusold = false; - tft.drawSmoothCircle(71, 15, 10, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(71, 15, 9, BackgroundColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); + tft.drawCircle(71, 15, 10, BackgroundColor); + tft.drawCircle(71, 15, 9, BackgroundColor); + tft.drawCircle(66, 15, 10, GreyoutColor); + tft.drawCircle(66, 15, 9, GreyoutColor); + tft.drawCircle(76, 15, 10, GreyoutColor); + tft.drawCircle(76, 15, 9, GreyoutColor); } } @@ -3033,16 +3033,16 @@ void ShowStereoStatus() { if (band < BAND_GAP) Stereostatus = radio.getStereoStatus(); else Stereostatus = false; if (Stereostatus != Stereostatusold) { if (Stereostatus && !screenmute) { - tft.drawSmoothCircle(66, 15, 10, StereoColor, StereoColorSmooth); - tft.drawSmoothCircle(66, 15, 9, StereoColor, StereoColorSmooth); - tft.drawSmoothCircle(76, 15, 10, StereoColor, StereoColorSmooth); - tft.drawSmoothCircle(76, 15, 9, StereoColor, StereoColorSmooth); + tft.drawCircle(66, 15, 10, StereoColor); + tft.drawCircle(66, 15, 9, StereoColor); + tft.drawCircle(76, 15, 10, StereoColor); + tft.drawCircle(76, 15, 9, StereoColor); } else { if (!screenmute) { - tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); + tft.drawCircle(66, 15, 10, GreyoutColor); + tft.drawCircle(66, 15, 9, GreyoutColor); + tft.drawCircle(76, 15, 10, GreyoutColor); + tft.drawCircle(76, 15, 9, GreyoutColor); } } Stereostatusold = Stereostatus; diff --git a/src/gui.cpp b/src/gui.cpp index 7cdbeae..172c181 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -1495,13 +1495,13 @@ void BuildAdvancedRDS() { tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor); if (!StereoToggle) { - tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); - tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); + tft.drawCircle(71, 15, 10, SecondaryColor); + tft.drawCircle(71, 15, 9, SecondaryColor); } else { - tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); + tft.drawCircle(66, 15, 10, GreyoutColor); + tft.drawCircle(66, 15, 9, GreyoutColor); + tft.drawCircle(76, 15, 10, GreyoutColor); + tft.drawCircle(76, 15, 9, GreyoutColor); } tftPrint(-1, "TP", 2, 51, GreyoutColor, BackgroundColor, 16); @@ -1641,13 +1641,13 @@ void BuildDisplay() { tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor); if (!StereoToggle) { - tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); - tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); + tft.drawCircle(71, 15, 10, SecondaryColor); + tft.drawCircle(71, 15, 9, SecondaryColor); } else { - tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); - tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); + tft.drawCircle(66, 15, 10, GreyoutColor); + tft.drawCircle(66, 15, 9, GreyoutColor); + tft.drawCircle(76, 15, 10, GreyoutColor); + tft.drawCircle(76, 15, 9, GreyoutColor); } if (bandforbidden) bandColor = GreyoutColor; else bandColor = PrimaryColor;