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

Removed smoothing from stereologo

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-26 18:17:10 +02:00
parent af63e7c40d
commit 97c621f705
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+32 -32
View File
@@ -2152,23 +2152,23 @@ void BWButtonPress() {
void doStereoToggle() { void doStereoToggle() {
if (StereoToggle) { if (StereoToggle) {
if (!screenmute) { if (!screenmute) {
tft.drawSmoothCircle(66, 15, 10, BackgroundColor, BackgroundColor); tft.drawCircle(66, 15, 10, BackgroundColor);
tft.drawSmoothCircle(66, 15, 9, BackgroundColor, BackgroundColor); tft.drawCircle(66, 15, 9, BackgroundColor);
tft.drawSmoothCircle(76, 15, 10, BackgroundColor, BackgroundColor); tft.drawCircle(76, 15, 10, BackgroundColor);
tft.drawSmoothCircle(76, 15, 9, BackgroundColor, BackgroundColor); tft.drawCircle(76, 15, 9, BackgroundColor);
tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 10, SecondaryColor);
tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 9, SecondaryColor);
} }
radio.setMono(true); radio.setMono(true);
StereoToggle = false; StereoToggle = false;
} else { } else {
if (!screenmute) { if (!screenmute) {
tft.drawSmoothCircle(71, 15, 10, BackgroundColor, BackgroundColor); tft.drawCircle(71, 15, 10, BackgroundColor);
tft.drawSmoothCircle(71, 15, 9, BackgroundColor, BackgroundColor); tft.drawCircle(71, 15, 9, BackgroundColor);
tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 10, GreyoutColor);
tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 9, GreyoutColor);
tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 10, GreyoutColor);
tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 9, GreyoutColor);
} }
radio.setMono(false); radio.setMono(false);
Stereostatusold = false; Stereostatusold = false;
@@ -2761,20 +2761,20 @@ void DoMemoryPosTune() {
StereoToggle = presets[memorypos].ms; StereoToggle = presets[memorypos].ms;
if (!StereoToggle) { if (!StereoToggle) {
Stereostatusold = false; Stereostatusold = false;
tft.drawSmoothCircle(66, 15, 10, BackgroundColor, BackgroundColor); tft.drawCircle(66, 15, 10, BackgroundColor);
tft.drawSmoothCircle(66, 15, 9, BackgroundColor, BackgroundColor); tft.drawCircle(66, 15, 9, BackgroundColor);
tft.drawSmoothCircle(76, 15, 10, BackgroundColor, BackgroundColor); tft.drawCircle(76, 15, 10, BackgroundColor);
tft.drawSmoothCircle(76, 15, 9, BackgroundColor, BackgroundColor); tft.drawCircle(76, 15, 9, BackgroundColor);
tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 10, SecondaryColor);
tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 9, SecondaryColor);
} else { } else {
Stereostatusold = false; Stereostatusold = false;
tft.drawSmoothCircle(71, 15, 10, BackgroundColor, BackgroundColor); tft.drawCircle(71, 15, 10, BackgroundColor);
tft.drawSmoothCircle(71, 15, 9, BackgroundColor, BackgroundColor); tft.drawCircle(71, 15, 9, BackgroundColor);
tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 10, GreyoutColor);
tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 9, GreyoutColor);
tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 10, GreyoutColor);
tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 9, GreyoutColor);
} }
} }
@@ -3033,16 +3033,16 @@ void ShowStereoStatus() {
if (band < BAND_GAP) Stereostatus = radio.getStereoStatus(); else Stereostatus = false; if (band < BAND_GAP) Stereostatus = radio.getStereoStatus(); else Stereostatus = false;
if (Stereostatus != Stereostatusold) { if (Stereostatus != Stereostatusold) {
if (Stereostatus && !screenmute) { if (Stereostatus && !screenmute) {
tft.drawSmoothCircle(66, 15, 10, StereoColor, StereoColorSmooth); tft.drawCircle(66, 15, 10, StereoColor);
tft.drawSmoothCircle(66, 15, 9, StereoColor, StereoColorSmooth); tft.drawCircle(66, 15, 9, StereoColor);
tft.drawSmoothCircle(76, 15, 10, StereoColor, StereoColorSmooth); tft.drawCircle(76, 15, 10, StereoColor);
tft.drawSmoothCircle(76, 15, 9, StereoColor, StereoColorSmooth); tft.drawCircle(76, 15, 9, StereoColor);
} else { } else {
if (!screenmute) { if (!screenmute) {
tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 10, GreyoutColor);
tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 9, GreyoutColor);
tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 10, GreyoutColor);
tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 9, GreyoutColor);
} }
} }
Stereostatusold = Stereostatus; Stereostatusold = Stereostatus;
src/gui.cpp
+12 -12
View File
@@ -1495,13 +1495,13 @@ void BuildAdvancedRDS() {
tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor); tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
if (!StereoToggle) { if (!StereoToggle) {
tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 10, SecondaryColor);
tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 9, SecondaryColor);
} else { } else {
tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 10, GreyoutColor);
tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 9, GreyoutColor);
tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 10, GreyoutColor);
tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 9, GreyoutColor);
} }
tftPrint(-1, "TP", 2, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "TP", 2, 51, GreyoutColor, BackgroundColor, 16);
@@ -1641,13 +1641,13 @@ void BuildDisplay() {
tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor); tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
if (!StereoToggle) { if (!StereoToggle) {
tft.drawSmoothCircle(71, 15, 10, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 10, SecondaryColor);
tft.drawSmoothCircle(71, 15, 9, SecondaryColor, SecondaryColorSmooth); tft.drawCircle(71, 15, 9, SecondaryColor);
} else { } else {
tft.drawSmoothCircle(66, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 10, GreyoutColor);
tft.drawSmoothCircle(66, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(66, 15, 9, GreyoutColor);
tft.drawSmoothCircle(76, 15, 10, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 10, GreyoutColor);
tft.drawSmoothCircle(76, 15, 9, GreyoutColor, BackgroundColor); tft.drawCircle(76, 15, 9, GreyoutColor);
} }
if (bandforbidden) bandColor = GreyoutColor; else bandColor = PrimaryColor; if (bandforbidden) bandColor = GreyoutColor; else bandColor = PrimaryColor;