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

Merge pull request #160 from MCelliotG/main

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-07-29 20:32:09 +02:00
committed by GitHub
parent 228edc4a0c 049777fb29
commit a17e4dc6a8
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
TEF6686_ESP32.ino
View File

@@ -4606,18 +4606,18 @@ void doSquelch() {
if (showsquelch && !advancedRDS && !afscreen) {
if (menu == false && Squelch != Squelchold) {
if (Squelchold == -100) {
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, BackgroundColor, BackgroundColor, FONT16);
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 235, 145, BackgroundColor, BackgroundColor, FONT16);
} else if (Squelchold == 920) {
if (Squelch != Squelchold) tftPrint(-1, "ST", 212, 163, BackgroundColor, BackgroundColor, FONT16);
if (Squelch != Squelchold) tftPrint(-1, "ST", 235, 145, BackgroundColor, BackgroundColor, FONT16);
} else {
if (Squelch != Squelchold) tftPrint(-1, String(Squelchold / 10), 212, 163, BackgroundColor, BackgroundColor, FONT16);
if (Squelch != Squelchold) tftPrint(-1, String(Squelchold / 10), 235, 145, BackgroundColor, BackgroundColor, FONT16);
}
if (Squelch == -100) {
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16);
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 235, 145, PrimaryColor, PrimaryColorSmooth, FONT16);
} else if (Squelch == 920) {
tftPrint(-1, "ST", 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16);
tftPrint(-1, "ST", 235, 145, PrimaryColor, PrimaryColorSmooth, FONT16);
} else {
if (Squelch != Squelchold) tftPrint(-1, String(Squelch / 10), 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16);
if (Squelch != Squelchold) tftPrint(-1, String(Squelch / 10), 235, 145, PrimaryColor, PrimaryColorSmooth, FONT16);
}
}
Squelchold = Squelch;
@@ -4649,18 +4649,18 @@ void doSquelch() {
if (screenmute == false && showsquelch == true && !advancedRDS && !afscreen) {
if (Squelch != Squelchold) {
if (Squelchold == -1) {
if (Squelch != Squelchold) tftPrint(-1, "ST", 212, 163, BackgroundColor, BackgroundColor, FONT16);
if (Squelch != Squelchold) tftPrint(-1, "ST", 235, 145, BackgroundColor, BackgroundColor, FONT16);
} else if (Squelchold == 0) {
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, BackgroundColor, BackgroundColor, FONT16);
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 235, 145, BackgroundColor, BackgroundColor, FONT16);
} else {
if (Squelch != Squelchold) tftPrint(-1, String(Squelchold / 10), 212, 163, BackgroundColor, BackgroundColor, FONT16);
if (Squelch != Squelchold) tftPrint(-1, String(Squelchold / 10), 235, 145, BackgroundColor, BackgroundColor, FONT16);
}
if (Squelch == -1) {
if (Squelch != Squelchold) tftPrint(-1, "ST", 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16);
if (Squelch != Squelchold) tftPrint(-1, "ST", 235, 145, PrimaryColor, PrimaryColorSmooth, FONT16);
} else if (Squelch == 0) {
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16);
if (Squelch != Squelchold) tftPrint(-1, myLanguage[language][33], 235, 145, PrimaryColor, PrimaryColorSmooth, FONT16);
} else {
if (Squelch != Squelchold) tftPrint(-1, String(Squelch / 10), 212, 163, PrimaryColor, PrimaryColorSmooth, FONT16);
if (Squelch != Squelchold) tftPrint(-1, String(Squelch / 10), 235, 145, PrimaryColor, PrimaryColorSmooth, FONT16);
}
Squelchold = Squelch;
}
@@ -5148,11 +5148,11 @@ void Communication() {
if (Squelch != Squelchold) {
if (screenmute == false) {
if (Squelchold == -100) {
tftPrint(-1, myLanguage[language][33], 212, 163, BackgroundColor, BackgroundColor, FONT16);
tftPrint(-1, myLanguage[language][33], 235, 145, BackgroundColor, BackgroundColor, FONT16);
} else if (Squelchold > 920) {
tftPrint(-1, "ST", 212, 163, BackgroundColor, BackgroundColor, FONT16);
tftPrint(-1, "ST", 235, 145, BackgroundColor, BackgroundColor, FONT16);
} else {
tftPrint(-1, String(Squelchold / 10), 212, 163, BackgroundColor, BackgroundColor, FONT16);
tftPrint(-1, String(Squelchold / 10), 235, 145, BackgroundColor, BackgroundColor, FONT16);
}
}
}