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

Fixed GUI issue in AF/EON view

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-02-04 10:59:33 +01:00
parent 3bf98516d3
commit 07d33a6487
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui.cpp
View File

@@ -466,6 +466,7 @@ void BuildAFScreen() {
tft.fillScreen(BackgroundColor); tft.fillScreen(BackgroundColor);
tft.drawRect(0, 0, 320, 240, FrameColor); tft.drawRect(0, 0, 320, 240, FrameColor);
tft.drawLine(0, 30, 320, 30, FrameColor); tft.drawLine(0, 30, 320, 30, FrameColor);
tft.drawLine(0, 15, 53, 15, FrameColor);
tft.drawLine(0, 199, 320, 199, FrameColor); tft.drawLine(0, 199, 320, 199, FrameColor);
tft.drawLine(0, 218, 320, 218, FrameColor); tft.drawLine(0, 218, 320, 218, FrameColor);
tft.drawLine(53, 30, 53, 0, FrameColor); tft.drawLine(53, 30, 53, 0, FrameColor);
@@ -480,9 +481,9 @@ void BuildAFScreen() {
} else if (afpagenr == 2) { } else if (afpagenr == 2) {
if (!radio.rds.hasEON) tftPrint(-1, myLanguage[language][88], 6, 48, PrimaryColor, PrimaryColorSmooth, 16); if (!radio.rds.hasEON) tftPrint(-1, myLanguage[language][88], 6, 48, PrimaryColor, PrimaryColorSmooth, 16);
} }
RDSstatusold = false; RDSstatusold = !RDSstatusold;
ShowFreq(0); ShowFreq(0);
Stereostatusold = false; Stereostatusold = !Stereostatusold;
haseonold = false; haseonold = false;
hasafold = false; hasafold = false;
BWreset = true; BWreset = true;
@@ -495,6 +496,9 @@ void BuildAFScreen() {
afmethodBold = false; afmethodBold = false;
PIold = " "; PIold = " ";
PSold = " "; PSold = " ";
rds_clockold = "";
dropout = false;
rdsreset = true;
xPos = 0; xPos = 0;
xPos2 = 0; xPos2 = 0;
xPos3 = 0; xPos3 = 0;
@@ -2822,6 +2826,7 @@ void BuildAdvancedRDS() {
tft.drawRect(0, 0, 320, 240, FrameColor); tft.drawRect(0, 0, 320, 240, FrameColor);
tft.drawLine(0, 30, 320, 30, FrameColor); tft.drawLine(0, 30, 320, 30, FrameColor);
tft.drawLine(0, 68, 320, 68, FrameColor); tft.drawLine(0, 68, 320, 68, FrameColor);
tft.drawLine(0, 15, 53, 15, FrameColor);
tft.drawLine(0, 104, 320, 104, FrameColor); tft.drawLine(0, 104, 320, 104, FrameColor);
tft.drawLine(0, 126, 320, 126, FrameColor); tft.drawLine(0, 126, 320, 126, FrameColor);
tft.drawLine(120, 30, 120, 0, FrameColor); tft.drawLine(120, 30, 120, 0, FrameColor);
@@ -2902,9 +2907,9 @@ void BuildAdvancedRDS() {
tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16); tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16);
RDSstatusold = false; RDSstatusold = !RDSstatusold;
ShowFreq(0); ShowFreq(0);
Stereostatusold = false; Stereostatusold = !Stereostatusold;
SStatusold = 2000; SStatusold = 2000;
SStatus = 100; SStatus = 100;
rssiold = 2000; rssiold = 2000;
@@ -3029,8 +3034,8 @@ void BuildDisplay() {
if (autosquelch) showAutoSquelch(1); if (autosquelch) showAutoSquelch(1);
RDSstatusold = false; RDSstatusold = !RDSstatusold;
Stereostatusold = false; Stereostatusold = !Stereostatusold;
LowLevelInit = true; LowLevelInit = true;
updateBW(); updateBW();
ShowMemoryPos(); ShowMemoryPos();
@@ -5548,9 +5553,9 @@ void Infoboxprint(const char* input) {
tftPrint(0, line1, 155, 48, ActiveColor, ActiveColorSmooth, 28); tftPrint(0, line1, 155, 48, ActiveColor, ActiveColorSmooth, 28);
tftPrint(0, line2, 155, 78, ActiveColor, ActiveColorSmooth, 28); tftPrint(0, line2, 155, 78, ActiveColor, ActiveColorSmooth, 28);
} else if (setupmode) { } else if (setupmode) {
tftPrint(0, line1, 155, 40, ActiveColor, ActiveColorSmooth, 28); tftPrint(0, line1, 155, 40, ActiveColor, ActiveColorSmooth, 28);
tftPrint(0, line2, 155, 70, ActiveColor, ActiveColorSmooth, 28); tftPrint(0, line2, 155, 70, ActiveColor, ActiveColorSmooth, 28);
} else { } else {
FrequencySprite.drawString(line1, 100, 5); FrequencySprite.drawString(line1, 100, 5);
FrequencySprite.drawString(line2, 100, 25); FrequencySprite.drawString(line2, 100, 25);
} }
@@ -5559,8 +5564,8 @@ void Infoboxprint(const char* input) {
} else { } else {
if (menu) { if (menu) {
tftPrint(0, input, 155, 78, ActiveColor, ActiveColorSmooth, 28); tftPrint(0, input, 155, 78, ActiveColor, ActiveColorSmooth, 28);
} else if (setupmode) { } else if (setupmode) {
tftPrint(0, input, 155, 70, ActiveColor, ActiveColorSmooth, 28); tftPrint(0, input, 155, 70, ActiveColor, ActiveColorSmooth, 28);
} else { } else {
FrequencySprite.drawString(input, 100, 15); FrequencySprite.drawString(input, 100, 15);
} }