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

Merge pull request #429 from MCelliotG/main

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-11-19 10:59:23 +01:00
committed by GitHub
parent 14ed599960 f12eb69979
commit 76904175a9
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui.cpp
+10 -10
View File
@@ -677,13 +677,13 @@ void BuildAdvancedRDS() {
}
tftPrint(-1, "TP", 2, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "TA", 25, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "AF", 52, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "-B", 70, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "TMC", 90, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "RT+", 127, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "EON", 155, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "S", 188, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "TA", 24, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "AF", 50, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "-B", 68, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "TMC", 88, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "RT+", 123, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16);
}
@@ -2152,7 +2152,7 @@ void DoMenu() {
case ITEM7:
Infoboxprint(myLanguage[language][199]);
if (fmdeemphasis != DEEMPHASIS_NONE) tftPrint(1, String((fmdeemphasis == DEEMPHASIS_50 ? FM_DEEMPHASIS_50 : FM_DEEMPHASIS_75), DEC), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(1, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28);
if (fmdeemphasis != DEEMPHASIS_NONE) tftPrint(1, String((fmdeemphasis == DEEMPHASIS_50 ? FM_DEEMPHASIS_50 : FM_DEEMPHASIS_75), DEC), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28);
if (fmdeemphasis != DEEMPHASIS_NONE) tftPrint(-1, "μs", 170, 118, ActiveColor, PrimaryColorSmooth, 28);
break;
}
@@ -2221,7 +2221,7 @@ void DoMenu() {
case ITEM10:
Infoboxprint(myLanguage[language][75]);
if (tot != 0) tftPrint(-1, myLanguage[language][205], 170, 118, ActiveColor, ActiveColorSmooth, 28);
if (tot != 0) tftPrint(1, String(tot), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(1, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28);
if (tot != 0) tftPrint(1, String(tot), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28);
break;
}
break;
@@ -2514,4 +2514,4 @@ void Infoboxprint(const char* input) {
} else {
tftPrint(0, input, 155, 78, ActiveColor, ActiveColorSmooth, 28);
}
}
}
src/language.h
+1 -1
View File
@@ -998,7 +998,7 @@ static const char* const myLanguage[18][208] = {
"Τηλέφωνο", // 154
"SMS στούντιο", // 155
"SMS", // 156 ***
"Email επικοινωνία", // 157
"Email επικοινωνίας", // 157
"Email στούντιο", // 158
"Email", // 159
"Chat", // 160
src/rds.cpp
+10 -10
View File
@@ -64,7 +64,7 @@ void ShowAdvancedRDS() {
if (radio.rds.hasAF) for (byte i = 0; i < radio.af_counter; i++) afstring += String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10) + (i == radio.af_counter - 1 ? " " : " | "); else afstring = myLanguage[language][87];
if (hasafold != radio.rds.hasAF) {
if (!screenmute) {
if (radio.rds.hasAF) tftPrint(-1, "AF", 52, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "AF", 52, 51, GreyoutColor, BackgroundColor, 16);
if (radio.rds.hasAF) tftPrint(-1, "AF", 50, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "AF", 50, 51, GreyoutColor, BackgroundColor, 16);
}
hasafold = radio.rds.hasAF;
}
@@ -91,7 +91,7 @@ void ShowAdvancedRDS() {
if (radio.rds.hasEON) for (byte i = 0; i < radio.eon_counter; i++) eonstring += String(radio.eon[i].picode) + (radio.eon[i].ps.length() > 0 ? String(": " + String(radio.eon[i].ps)) : "") + (radio.eon[i].mappedfreq > 0 ? String(" " + String(radio.eon[i].mappedfreq / 100) + "." + String((radio.eon[i].mappedfreq % 100) / 10)) : "") + (radio.eon[i].mappedfreq2 > 0 ? String(" / " + String(radio.eon[i].mappedfreq2 / 100) + "." + String((radio.eon[i].mappedfreq2 % 100) / 10)) : "") + (radio.eon[i].mappedfreq3 > 0 ? String(" / " + String(radio.eon[i].mappedfreq3 / 100) + "." + String((radio.eon[i].mappedfreq3 % 100) / 10)) : "") + (i == radio.eon_counter - 1 ? " " : " | "); else eonstring = myLanguage[language][88];
if (haseonold != radio.rds.hasEON) {
if (!screenmute) {
if (radio.rds.hasEON) tftPrint(-1, "EON", 155, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "EON", 155, 51, GreyoutColor, BackgroundColor, 16);
if (radio.rds.hasEON) tftPrint(-1, "EON", 153, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, 16);
}
haseonold = radio.rds.hasEON;
}
@@ -119,7 +119,7 @@ void ShowAdvancedRDS() {
if (radio.rds.hasRDSplus) rtplusstring = (radio.rds.rdsplusTag1 != 169 ? String(myLanguage[language][radio.rds.rdsplusTag1]) + ": " + String(radio.rds.RTContent1) : "") + (radio.rds.rdsplusTag2 != 169 ? " - " + String(myLanguage[language][radio.rds.rdsplusTag2]) + ": " + String(radio.rds.RTContent2) : "") + " "; else rtplusstring = myLanguage[language][89];
if (hasrtplusold != radio.rds.hasRDSplus) {
if (!screenmute) {
if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 127, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "RT+", 127, 51, GreyoutColor, BackgroundColor, 16);
if (radio.rds.hasRDSplus) tftPrint(-1, "RT+", 123, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "RT+", 123, 51, GreyoutColor, BackgroundColor, 16);
}
hasrtplusold = radio.rds.hasRDSplus;
}
@@ -151,14 +151,14 @@ void ShowAdvancedRDS() {
if (TAold != radio.rds.hasTA) {
if (!screenmute) {
if (radio.rds.hasTA) tftPrint(-1, "TA", 25, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TA", 25, 51, GreyoutColor, BackgroundColor, 16);
if (radio.rds.hasTA) tftPrint(-1, "TA", 24, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TA", 24, 51, GreyoutColor, BackgroundColor, 16);
}
TAold = radio.rds.hasTA;
}
if (afmethodBold != radio.afmethodB || rdsreset) {
if (!screenmute) {
if (radio.afmethodB) tftPrint(-1, "-B", 70, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "-B", 70, 51, GreyoutColor, BackgroundColor, 16);
if (radio.afmethodB) tftPrint(-1, "-B", 68, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "-B", 68, 51, GreyoutColor, BackgroundColor, 16);
}
afmethodBold = radio.afmethodB;
}
@@ -168,17 +168,17 @@ void ShowAdvancedRDS() {
switch (radio.rds.MS) {
case 0:
tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "S", 188, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16);
break;
case 1:
tftPrint(-1, "M", 196, 51, PrimaryColor, PrimaryColorSmooth, 16);
tftPrint(-1, "S", 188, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "S", 185, 51, GreyoutColor, BackgroundColor, 16);
break;
case 2:
tftPrint(-1, "M", 196, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "S", 188, 51, PrimaryColor, PrimaryColorSmooth, 16);
tftPrint(-1, "S", 185, 51, PrimaryColor, PrimaryColorSmooth, 16);
break;
}
}
@@ -193,7 +193,7 @@ void ShowAdvancedRDS() {
if (hastmcold != radio.rds.hasTMC) {
if (!screenmute) {
if (radio.rds.hasTMC) tftPrint(-1, "TMC", 90, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TMC", 90, 51, GreyoutColor, BackgroundColor, 16);
if (radio.rds.hasTMC) tftPrint(-1, "TMC", 88, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "TMC", 88, 51, GreyoutColor, BackgroundColor, 16);
}
hastmcold = radio.rds.hasTMC;
}
@@ -764,4 +764,4 @@ void ShowAFEON() {
}
}
}
#pragma GCC diagnostic pop
#pragma GCC diagnostic pop