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

Moved ECC and LIC text conversion to API

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-10-18 13:30:54 +02:00
parent 4fe5a936eb
commit f709dbec42
3 changed files with 330 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rds.cpp
+7 -276
View File
@@ -53,19 +53,11 @@ void ShowAdvancedRDS() {
}
if (licold != radio.rds.LIC || rdsreset) {
if (!screenmute) tftPrint(-1, "N/A", 242, 208, BackgroundColor, BackgroundColor, 16);
if (!screenmute) tftPrint(-1, LIColdString, 242, 208, BackgroundColor, BackgroundColor, 16);
if (radio.rds.LIC > 0 && radio.rds.LIC < 128) {
if (!screenmute) {
if (radio.rds.hasLIC) tftPrint(-1, LICtext[radio.rds.LIC], 242, 208, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 208, PrimaryColor, PrimaryColorSmooth, 16);
}
LIColdString = LICtext[radio.rds.LIC];
} else {
if (!screenmute) {
if (radio.rds.hasLIC) tftPrint(-1, LICtext[0], 242, 208, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 208, PrimaryColor, PrimaryColorSmooth, 16);
}
LIColdString = LICtext[0];
if (!screenmute) {
tftPrint(-1, "N/A", 242, 208, BackgroundColor, BackgroundColor, 16);
tftPrint(-1, LIColdString, 242, 208, BackgroundColor, BackgroundColor, 16);
if (radio.rds.hasLIC) tftPrint(-1, (radio.rds.LICtext.length() == 0 ? myLanguage[language][73] : radio.rds.LICtext), 242, 208, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 208, PrimaryColor, PrimaryColorSmooth, 16);
if (radio.rds.LICtext.length() == 0) LIColdString = myLanguage[language][73]; else LIColdString = radio.rds.LICtext;
}
licold = radio.rds.LIC;
}
@@ -276,274 +268,13 @@ void doAF() {
void showECC() {
if (ECCold != radio.rds.ECC) {
String ECC;
ECC = myLanguage[language][73];
if (radio.rds.picode[0] == '1') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[129];
if (radio.rds.ECC == 163) ECC = ECCtext[136];
if (radio.rds.ECC == 164) ECC = ECCtext[152];
if (radio.rds.ECC == 208) ECC = ECCtext[104];
if (radio.rds.ECC == 209) ECC = ECCtext[73];
if (radio.rds.ECC == 210) ECC = ECCtext[83];
if (radio.rds.ECC == 224) ECC = ECCtext[0];
if (radio.rds.ECC == 225) ECC = ECCtext[1];
if (radio.rds.ECC == 226) ECC = ECCtext[2];
if (radio.rds.ECC == 227) ECC = ECCtext[59];
if (radio.rds.ECC == 228) ECC = ECCtext[3];
if (radio.rds.ECC == 240) ECC = ECCtext[179];
if (radio.rds.ECC == 241) ECC = ECCtext[197];
if (radio.rds.ECC == 242) ECC = ECCtext[124];
if (radio.rds.ECC == 243) ECC = ECCtext[200];
} else if (radio.rds.picode[0] == '2') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[130];
if (radio.rds.ECC == 163) ECC = ECCtext[141];
if (radio.rds.ECC == 164) ECC = ECCtext[155];
if (radio.rds.ECC == 208) ECC = ECCtext[106];
if (radio.rds.ECC == 209) ECC = ECCtext[126];
if (radio.rds.ECC == 210) ECC = ECCtext[95];
if (radio.rds.ECC == 224) ECC = ECCtext[4];
if (radio.rds.ECC == 225) ECC = ECCtext[5];
if (radio.rds.ECC == 226) ECC = ECCtext[6];
if (radio.rds.ECC == 227) ECC = ECCtext[7];
if (radio.rds.ECC == 228) ECC = ECCtext[8];
if (radio.rds.ECC == 240) ECC = ECCtext[180];
if (radio.rds.ECC == 241) ECC = ECCtext[187];
if (radio.rds.ECC == 242) ECC = ECCtext[77];
if (radio.rds.ECC == 243) ECC = ECCtext[218];
} else if (radio.rds.picode[0] == '3') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[224];
if (radio.rds.ECC == 163) ECC = ECCtext[156];
if (radio.rds.ECC == 164) ECC = ECCtext[132];
if (radio.rds.ECC == 208) ECC = ECCtext[112];
if (radio.rds.ECC == 209) ECC = ECCtext[119];
if (radio.rds.ECC == 210) ECC = ECCtext[72];
if (radio.rds.ECC == 211) ECC = ECCtext[92];
if (radio.rds.ECC == 224) ECC = ECCtext[9];
if (radio.rds.ECC == 225) ECC = ECCtext[10];
if (radio.rds.ECC == 226) ECC = ECCtext[11];
if (radio.rds.ECC == 227) ECC = ECCtext[12];
if (radio.rds.ECC == 228) ECC = ECCtext[16];
if (radio.rds.ECC == 229) ECC = ECCtext[63];
if (radio.rds.ECC == 240) ECC = ECCtext[181];
if (radio.rds.ECC == 241) ECC = ECCtext[227];
if (radio.rds.ECC == 242) ECC = ECCtext[189];
if (radio.rds.ECC == 243) ECC = ECCtext[219];
} else if (radio.rds.picode[0] == '4') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[148];
if (radio.rds.ECC == 163) ECC = ECCtext[157];
if (radio.rds.ECC == 208) ECC = ECCtext[127];
if (radio.rds.ECC == 209) ECC = ECCtext[69];
if (radio.rds.ECC == 210) ECC = ECCtext[91];
if (radio.rds.ECC == 211) ECC = ECCtext[103];
if (radio.rds.ECC == 224) ECC = ECCtext[13];
if (radio.rds.ECC == 225) ECC = ECCtext[14];
if (radio.rds.ECC == 226) ECC = ECCtext[15];
if (radio.rds.ECC == 240) ECC = ECCtext[182];
if (radio.rds.ECC == 241) ECC = ECCtext[210];
if (radio.rds.ECC == 242) ECC = ECCtext[213];
} else if (radio.rds.picode[0] == '5') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[133];
if (radio.rds.ECC == 164) ECC = ECCtext[159];
if (radio.rds.ECC == 208) ECC = ECCtext[68];
if (radio.rds.ECC == 209) ECC = ECCtext[79];
if (radio.rds.ECC == 210) ECC = ECCtext[88];
if (radio.rds.ECC == 211) ECC = ECCtext[78];
if (radio.rds.ECC == 224) ECC = ECCtext[17];
if (radio.rds.ECC == 225) ECC = ECCtext[18];
if (radio.rds.ECC == 226) ECC = ECCtext[19];
if (radio.rds.ECC == 227) ECC = ECCtext[65];
if (radio.rds.ECC == 240) ECC = ECCtext[183];
if (radio.rds.ECC == 241) ECC = ECCtext[191];
if (radio.rds.ECC == 242) ECC = ECCtext[193];
} else if (radio.rds.picode[0] == '6') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[134];
if (radio.rds.ECC == 163) ECC = ECCtext[163];
if (radio.rds.ECC == 164) ECC = ECCtext[171];
if (radio.rds.ECC == 208) ECC = ECCtext[96];
if (radio.rds.ECC == 209) ECC = ECCtext[105];
if (radio.rds.ECC == 210) ECC = ECCtext[123];
if (radio.rds.ECC == 211) ECC = ECCtext[125];
if (radio.rds.ECC == 224) ECC = ECCtext[20];
if (radio.rds.ECC == 225) ECC = ECCtext[21];
if (radio.rds.ECC == 226) ECC = ECCtext[22];
if (radio.rds.ECC == 228) ECC = ECCtext[24];
if (radio.rds.ECC == 240) ECC = ECCtext[184];
if (radio.rds.ECC == 241) ECC = ECCtext[76];
if (radio.rds.ECC == 242) ECC = ECCtext[201];
} else if (radio.rds.picode[0] == '7') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[139];
if (radio.rds.ECC == 163) ECC = ECCtext[161];
if (radio.rds.ECC == 164) ECC = ECCtext[164];
if (radio.rds.ECC == 208) ECC = ECCtext[113];
if (radio.rds.ECC == 209) ECC = ECCtext[81];
if (radio.rds.ECC == 210) ECC = ECCtext[84];
if (radio.rds.ECC == 224) ECC = ECCtext[25];
if (radio.rds.ECC == 225) ECC = ECCtext[26];
if (radio.rds.ECC == 226) ECC = ECCtext[27];
if (radio.rds.ECC == 228) ECC = ECCtext[62];
if (radio.rds.ECC == 240) ECC = ECCtext[185];
if (radio.rds.ECC == 241) ECC = ECCtext[207];
if (radio.rds.ECC == 242) ECC = ECCtext[221];
} else if (radio.rds.picode[0] == '8') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[142];
if (radio.rds.ECC == 164) ECC = ECCtext[170];
if (radio.rds.ECC == 208) ECC = ECCtext[116];
if (radio.rds.ECC == 209) ECC = ECCtext[117];
if (radio.rds.ECC == 210) ECC = ECCtext[74];
if (radio.rds.ECC == 211) ECC = ECCtext[82];
if (radio.rds.ECC == 224) ECC = ECCtext[28];
if (radio.rds.ECC == 225) ECC = ECCtext[29];
if (radio.rds.ECC == 226) ECC = ECCtext[30];
if (radio.rds.ECC == 227) ECC = ECCtext[31];
if (radio.rds.ECC == 228) ECC = ECCtext[32];
if (radio.rds.ECC == 240) ECC = ECCtext[186];
if (radio.rds.ECC == 241) ECC = ECCtext[195];
if (radio.rds.ECC == 242) ECC = ECCtext[212];
if (radio.rds.ECC == 243) ECC = ECCtext[190];
} else if (radio.rds.picode[0] == '9') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[143];
if (radio.rds.ECC == 163) ECC = ECCtext[162];
if (radio.rds.ECC == 164) ECC = ECCtext[174];
if (radio.rds.ECC == 208) ECC = ECCtext[120];
if (radio.rds.ECC == 209) ECC = ECCtext[102];
if (radio.rds.ECC == 210) ECC = ECCtext[107];
if (radio.rds.ECC == 224) ECC = ECCtext[33];
if (radio.rds.ECC == 225) ECC = ECCtext[34];
if (radio.rds.ECC == 226) ECC = ECCtext[35];
if (radio.rds.ECC == 227) ECC = ECCtext[36];
if (radio.rds.ECC == 228) ECC = ECCtext[37];
if (radio.rds.ECC == 240) ECC = ECCtext[80];
if (radio.rds.ECC == 241) ECC = ECCtext[209];
if (radio.rds.ECC == 242) ECC = ECCtext[196];
if (radio.rds.ECC == 243) ECC = ECCtext[211];
if (radio.rds.ECC == 244) ECC = ECCtext[190];
} else if (radio.rds.picode[0] == 'A') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 162) ECC = ECCtext[131];
if (radio.rds.ECC == 163) ECC = ECCtext[144];
if (radio.rds.ECC == 164) ECC = ECCtext[166];
if (radio.rds.ECC == 208) ECC = ECCtext[85];
if (radio.rds.ECC == 209) ECC = ECCtext[97];
if (radio.rds.ECC == 210) ECC = ECCtext[121];
if (radio.rds.ECC == 211) ECC = ECCtext[70];
if (radio.rds.ECC == 212) ECC = ECCtext[86];
if (radio.rds.ECC == 224) ECC = ECCtext[38];
if (radio.rds.ECC == 225) ECC = ECCtext[39];
if (radio.rds.ECC == 226) ECC = ECCtext[40];
if (radio.rds.ECC == 227) ECC = ECCtext[41];
if (radio.rds.ECC == 228) ECC = ECCtext[60];
if (radio.rds.ECC == 240) ECC = ECCtext[178];
if (radio.rds.ECC == 241) ECC = ECCtext[215];
if (radio.rds.ECC == 242) ECC = ECCtext[214];
} else if (radio.rds.picode[0] == 'B') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 161) ECC = ECCtext[138];
if (radio.rds.ECC == 162) ECC = ECCtext[137];
if (radio.rds.ECC == 163) ECC = ECCtext[145];
if (radio.rds.ECC == 164) ECC = ECCtext[167];
if (radio.rds.ECC == 165) ECC = ECCtext[158];
if (radio.rds.ECC == 208) ECC = ECCtext[101];
if (radio.rds.ECC == 210) ECC = ECCtext[109];
if (radio.rds.ECC == 209) ECC = ECCtext[100];
if (radio.rds.ECC == 224) ECC = ECCtext[42];
if (radio.rds.ECC == 225) ECC = ECCtext[43];
if (radio.rds.ECC == 226) ECC = ECCtext[44];
if (radio.rds.ECC == 227) ECC = ECCtext[61];
if (radio.rds.ECC == 228) ECC = ECCtext[66];
if (radio.rds.ECC == 240) ECC = ECCtext[206];
if (radio.rds.ECC == 241) ECC = ECCtext[188];
if (radio.rds.ECC == 242) ECC = ECCtext[203];
if (radio.rds.ECC == 243) ECC = ECCtext[93];
if (radio.rds.ECC == 244) ECC = ECCtext[204];
} else if (radio.rds.picode[0] == 'C') {
if (radio.rds.ECC == 161) ECC = ECCtext[138];
if (radio.rds.ECC == 162) ECC = ECCtext[223];
if (radio.rds.ECC == 163) ECC = ECCtext[140];
if (radio.rds.ECC == 164) ECC = ECCtext[146];
if (radio.rds.ECC == 165) ECC = ECCtext[169];
if (radio.rds.ECC == 208) ECC = ECCtext[110];
if (radio.rds.ECC == 209) ECC = ECCtext[108];
if (radio.rds.ECC == 210) ECC = ECCtext[111];
if (radio.rds.ECC == 211) ECC = ECCtext[87];
if (radio.rds.ECC == 224) ECC = ECCtext[45];
if (radio.rds.ECC == 225) ECC = ECCtext[46];
if (radio.rds.ECC == 226) ECC = ECCtext[47];
if (radio.rds.ECC == 227) ECC = ECCtext[48];
if (radio.rds.ECC == 228) ECC = ECCtext[118];
if (radio.rds.ECC == 240) ECC = ECCtext[190];
if (radio.rds.ECC == 241) ECC = ECCtext[216];
if (radio.rds.ECC == 242) ECC = ECCtext[194];
} else if (radio.rds.picode[0] == 'D') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 161) ECC = ECCtext[138];
if (radio.rds.ECC == 162) ECC = ECCtext[225];
if (radio.rds.ECC == 163) ECC = ECCtext[150];
if (radio.rds.ECC == 164) ECC = ECCtext[154];
if (radio.rds.ECC == 165) ECC = ECCtext[158];
if (radio.rds.ECC == 208) ECC = ECCtext[90];
if (radio.rds.ECC == 209) ECC = ECCtext[89];
if (radio.rds.ECC == 224) ECC = ECCtext[0];
if (radio.rds.ECC == 225) ECC = ECCtext[49];
if (radio.rds.ECC == 226) ECC = ECCtext[23];
if (radio.rds.ECC == 227) ECC = ECCtext[122];
if (radio.rds.ECC == 240) ECC = ECCtext[198];
if (radio.rds.ECC == 241) ECC = ECCtext[217];
if (radio.rds.ECC == 242) ECC = ECCtext[128];
} else if (radio.rds.picode[0] == 'E') {
if (radio.rds.ECC == 160) ECC = ECCtext[226];
if (radio.rds.ECC == 161) ECC = ECCtext[138];
if (radio.rds.ECC == 162) ECC = ECCtext[151];
if (radio.rds.ECC == 163) ECC = ECCtext[172];
if (radio.rds.ECC == 164) ECC = ECCtext[175];
if (radio.rds.ECC == 165) ECC = ECCtext[158];
if (radio.rds.ECC == 208) ECC = ECCtext[99];
if (radio.rds.ECC == 209) ECC = ECCtext[115];
if (radio.rds.ECC == 210) ECC = ECCtext[94];
if (radio.rds.ECC == 224) ECC = ECCtext[50];
if (radio.rds.ECC == 225) ECC = ECCtext[51];
if (radio.rds.ECC == 226) ECC = ECCtext[52];
if (radio.rds.ECC == 227) ECC = ECCtext[53];
if (radio.rds.ECC == 228) ECC = ECCtext[64];
if (radio.rds.ECC == 240) ECC = ECCtext[98];
if (radio.rds.ECC == 241) ECC = ECCtext[199];
if (radio.rds.ECC == 242) ECC = ECCtext[208];
if (radio.rds.ECC == 243) ECC = ECCtext[205];
} else if (radio.rds.picode[0] == 'F') {
if (radio.rds.ECC == 161) ECC = ECCtext[149];
if (radio.rds.ECC == 162) ECC = ECCtext[222];
if (radio.rds.ECC == 163) ECC = ECCtext[153];
if (radio.rds.ECC == 164) ECC = ECCtext[176];
if (radio.rds.ECC == 165) ECC = ECCtext[158];
if (radio.rds.ECC == 166) ECC = ECCtext[168];
if (radio.rds.ECC == 208) ECC = ECCtext[67];
if (radio.rds.ECC == 209) ECC = ECCtext[75];
if (radio.rds.ECC == 210) ECC = ECCtext[114];
if (radio.rds.ECC == 224) ECC = ECCtext[54];
if (radio.rds.ECC == 225) ECC = ECCtext[55];
if (radio.rds.ECC == 226) ECC = ECCtext[56];
if (radio.rds.ECC == 227) ECC = ECCtext[57];
if (radio.rds.ECC == 228) ECC = ECCtext[58];
if (radio.rds.ECC == 240) ECC = ECCtext[202];
if (radio.rds.ECC == 241) ECC = ECCtext[192];
if (radio.rds.ECC == 242) ECC = ECCtext[220];
if (radio.rds.ECC == 243) ECC = ECCtext[71];
}
if (advancedRDS) {
if (!screenmute) {
tftPrint(-1, "N/A", 242, 193, BackgroundColor, BackgroundColor, 16);
tftPrint(-1, ECColdtxt, 242, 193, BackgroundColor, BackgroundColor, 16);
if (radio.rds.hasECC) tftPrint(-1, ECC, 242, 193, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 193, PrimaryColor, PrimaryColorSmooth, 16);
if (radio.rds.hasECC) tftPrint(-1, (radio.rds.ECCtext.length() == 0 ? myLanguage[language][73] : radio.rds.ECCtext), 242, 193, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "N/A", 242, 193, PrimaryColor, PrimaryColorSmooth, 16);
}
ECColdtxt = ECC;
if (radio.rds.ECCtext.length() == 0) ECColdtxt = myLanguage[language][87]; else ECColdtxt = radio.rds.ECCtext;
}
if (wifi) {