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

complete ecc

Browse Source
This commit is contained in:
kuba
2026-01-06 12:21:29 +01:00
parent ec9800d180
commit 528dc76ec0
7 changed files with 468 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TEF6686.cpp
+244 -243
View File
@@ -760,305 +760,306 @@ void TEF6686::readRDS(byte showrdserrors) {
switch (rds.picode[0]) {
case '1': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[129];
if (rds.ECC == 163) rds.ECCtext = ECCtext[136];
if (rds.ECC == 164) rds.ECCtext = ECCtext[152];
if (rds.ECC == 208) rds.ECCtext = ECCtext[104];
if (rds.ECC == 209) rds.ECCtext = ECCtext[73];
if (rds.ECC == 210) rds.ECCtext = ECCtext[83];
if (rds.ECC == 224) rds.ECCtext = ECCtext[0];
if (rds.ECC == 225) rds.ECCtext = ECCtext[1];
if (rds.ECC == 226) rds.ECCtext = ECCtext[2];
if (rds.ECC == 227) rds.ECCtext = ECCtext[59];
if (rds.ECC == 228) rds.ECCtext = ECCtext[3];
if (rds.ECC == 240) rds.ECCtext = ECCtext[179];
if (rds.ECC == 241) rds.ECCtext = ECCtext[197];
if (rds.ECC == 242) rds.ECCtext = ECCtext[124];
if (rds.ECC == 243) rds.ECCtext = ECCtext[200];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[129];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[136];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[152];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[104];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[73];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[83];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[0];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[1];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[2];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[59];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[3];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[179];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[197];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[124];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[200];
break;
}
case '2': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[130];
if (rds.ECC == 163) rds.ECCtext = ECCtext[141];
if (rds.ECC == 164) rds.ECCtext = ECCtext[155];
if (rds.ECC == 208) rds.ECCtext = ECCtext[106];
if (rds.ECC == 209) rds.ECCtext = ECCtext[126];
if (rds.ECC == 210) rds.ECCtext = ECCtext[95];
if (rds.ECC == 224) rds.ECCtext = ECCtext[4];
if (rds.ECC == 225) rds.ECCtext = ECCtext[5];
if (rds.ECC == 226) rds.ECCtext = ECCtext[6];
if (rds.ECC == 227) rds.ECCtext = ECCtext[7];
if (rds.ECC == 228) rds.ECCtext = ECCtext[8];
if (rds.ECC == 240) rds.ECCtext = ECCtext[180];
if (rds.ECC == 241) rds.ECCtext = ECCtext[187];
if (rds.ECC == 242) rds.ECCtext = ECCtext[77];
if (rds.ECC == 243) rds.ECCtext = ECCtext[218];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[130];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[141];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[155];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[106];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[126];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[95];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[4];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[5];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[6];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[7];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[8];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[180];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[187];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[77];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[218];
break;
}
case '3': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[224];
if (rds.ECC == 163) rds.ECCtext = ECCtext[156];
if (rds.ECC == 164) rds.ECCtext = ECCtext[132];
if (rds.ECC == 208) rds.ECCtext = ECCtext[112];
if (rds.ECC == 209) rds.ECCtext = ECCtext[119];
if (rds.ECC == 210) rds.ECCtext = ECCtext[72];
if (rds.ECC == 211) rds.ECCtext = ECCtext[92];
if (rds.ECC == 224) rds.ECCtext = ECCtext[9];
if (rds.ECC == 225) rds.ECCtext = ECCtext[10];
if (rds.ECC == 226) rds.ECCtext = ECCtext[11];
if (rds.ECC == 227) rds.ECCtext = ECCtext[12];
if (rds.ECC == 228) rds.ECCtext = ECCtext[16];
if (rds.ECC == 229) rds.ECCtext = ECCtext[63];
if (rds.ECC == 240) rds.ECCtext = ECCtext[181];
if (rds.ECC == 241) rds.ECCtext = ECCtext[227];
if (rds.ECC == 242) rds.ECCtext = ECCtext[189];
if (rds.ECC == 243) rds.ECCtext = ECCtext[219];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[224];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[156];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[132];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[112];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[119];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[72];
else if (rds.ECC == 0xD3) rds.ECCtext = ECCtext[92];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[9];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[10];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[11];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[12];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[16];
else if (rds.ECC == 0xE5) rds.ECCtext = ECCtext[63];
else if (rds.ECC == 0xE6) rds.ECCtext = ECCtext[228];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[181];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[227];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[189];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[219];
break;
}
case '4': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[148];
if (rds.ECC == 163) rds.ECCtext = ECCtext[157];
if (rds.ECC == 208) rds.ECCtext = ECCtext[127];
if (rds.ECC == 209) rds.ECCtext = ECCtext[69];
if (rds.ECC == 210) rds.ECCtext = ECCtext[91];
if (rds.ECC == 211) rds.ECCtext = ECCtext[103];
if (rds.ECC == 224) rds.ECCtext = ECCtext[13];
if (rds.ECC == 225) rds.ECCtext = ECCtext[14];
if (rds.ECC == 226) rds.ECCtext = ECCtext[15];
if (rds.ECC == 240) rds.ECCtext = ECCtext[182];
if (rds.ECC == 241) rds.ECCtext = ECCtext[210];
if (rds.ECC == 242) rds.ECCtext = ECCtext[213];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[148];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[157];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[127];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[69];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[91];
else if (rds.ECC == 0xD3) rds.ECCtext = ECCtext[103];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[13];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[14];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[15];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[182];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[210];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[213];
break;
}
case '5': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[133];
if (rds.ECC == 164) rds.ECCtext = ECCtext[159];
if (rds.ECC == 208) rds.ECCtext = ECCtext[68];
if (rds.ECC == 209) rds.ECCtext = ECCtext[79];
if (rds.ECC == 210) rds.ECCtext = ECCtext[88];
if (rds.ECC == 211) rds.ECCtext = ECCtext[78];
if (rds.ECC == 224) rds.ECCtext = ECCtext[17];
if (rds.ECC == 225) rds.ECCtext = ECCtext[18];
if (rds.ECC == 226) rds.ECCtext = ECCtext[19];
if (rds.ECC == 227) rds.ECCtext = ECCtext[65];
if (rds.ECC == 240) rds.ECCtext = ECCtext[183];
if (rds.ECC == 241) rds.ECCtext = ECCtext[191];
if (rds.ECC == 242) rds.ECCtext = ECCtext[193];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[133];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[159];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[68];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[79];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[88];
else if (rds.ECC == 0xD3) rds.ECCtext = ECCtext[78];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[17];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[18];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[19];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[65];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[183];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[191];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[193];
break;
}
case '6': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[134];
if (rds.ECC == 163) rds.ECCtext = ECCtext[163];
if (rds.ECC == 164) rds.ECCtext = ECCtext[171];
if (rds.ECC == 208) rds.ECCtext = ECCtext[96];
if (rds.ECC == 209) rds.ECCtext = ECCtext[105];
if (rds.ECC == 210) rds.ECCtext = ECCtext[123];
if (rds.ECC == 211) rds.ECCtext = ECCtext[125];
if (rds.ECC == 224) rds.ECCtext = ECCtext[20];
if (rds.ECC == 225) rds.ECCtext = ECCtext[21];
if (rds.ECC == 226) rds.ECCtext = ECCtext[22];
if (rds.ECC == 228) rds.ECCtext = ECCtext[24];
if (rds.ECC == 240) rds.ECCtext = ECCtext[184];
if (rds.ECC == 241) rds.ECCtext = ECCtext[76];
if (rds.ECC == 242) rds.ECCtext = ECCtext[201];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[134];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[163];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[171];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[96];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[105];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[123];
else if (rds.ECC == 0xD3) rds.ECCtext = ECCtext[125];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[20];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[21];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[22];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[24];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[184];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[76];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[201];
break;
}
case '7': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[139];
if (rds.ECC == 163) rds.ECCtext = ECCtext[161];
if (rds.ECC == 164) rds.ECCtext = ECCtext[164];
if (rds.ECC == 208) rds.ECCtext = ECCtext[113];
if (rds.ECC == 209) rds.ECCtext = ECCtext[81];
if (rds.ECC == 210) rds.ECCtext = ECCtext[84];
if (rds.ECC == 224) rds.ECCtext = ECCtext[25];
if (rds.ECC == 225) rds.ECCtext = ECCtext[26];
if (rds.ECC == 226) rds.ECCtext = ECCtext[27];
if (rds.ECC == 228) rds.ECCtext = ECCtext[62];
if (rds.ECC == 240) rds.ECCtext = ECCtext[185];
if (rds.ECC == 241) rds.ECCtext = ECCtext[207];
if (rds.ECC == 242) rds.ECCtext = ECCtext[221];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[139];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[161];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[164];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[113];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[81];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[84];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[25];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[26];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[27];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[62];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[185];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[207];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[221];
break;
}
case '8': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[142];
if (rds.ECC == 164) rds.ECCtext = ECCtext[170];
if (rds.ECC == 208) rds.ECCtext = ECCtext[116];
if (rds.ECC == 209) rds.ECCtext = ECCtext[117];
if (rds.ECC == 210) rds.ECCtext = ECCtext[74];
if (rds.ECC == 211) rds.ECCtext = ECCtext[82];
if (rds.ECC == 224) rds.ECCtext = ECCtext[28];
if (rds.ECC == 225) rds.ECCtext = ECCtext[29];
if (rds.ECC == 226) rds.ECCtext = ECCtext[30];
if (rds.ECC == 227) rds.ECCtext = ECCtext[31];
if (rds.ECC == 228) rds.ECCtext = ECCtext[32];
if (rds.ECC == 240) rds.ECCtext = ECCtext[186];
if (rds.ECC == 241) rds.ECCtext = ECCtext[195];
if (rds.ECC == 242) rds.ECCtext = ECCtext[212];
if (rds.ECC == 243) rds.ECCtext = ECCtext[190];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[142];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[170];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[116];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[117];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[74];
else if (rds.ECC == 0xD3) rds.ECCtext = ECCtext[82];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[28];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[29];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[30];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[31];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[32];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[186];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[195];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[212];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[190];
break;
}
case '9': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[143];
if (rds.ECC == 163) rds.ECCtext = ECCtext[162];
if (rds.ECC == 164) rds.ECCtext = ECCtext[174];
if (rds.ECC == 208) rds.ECCtext = ECCtext[120];
if (rds.ECC == 209) rds.ECCtext = ECCtext[102];
if (rds.ECC == 210) rds.ECCtext = ECCtext[107];
if (rds.ECC == 224) rds.ECCtext = ECCtext[33];
if (rds.ECC == 225) rds.ECCtext = ECCtext[34];
if (rds.ECC == 226) rds.ECCtext = ECCtext[35];
if (rds.ECC == 227) rds.ECCtext = ECCtext[36];
if (rds.ECC == 228) rds.ECCtext = ECCtext[37];
if (rds.ECC == 240) rds.ECCtext = ECCtext[80];
if (rds.ECC == 241) rds.ECCtext = ECCtext[209];
if (rds.ECC == 242) rds.ECCtext = ECCtext[196];
if (rds.ECC == 243) rds.ECCtext = ECCtext[211];
if (rds.ECC == 244) rds.ECCtext = ECCtext[190];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[143];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[162];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[174];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[120];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[102];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[107];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[33];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[34];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[35];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[36];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[37];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[80];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[209];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[196];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[211];
else if (rds.ECC == 0xF4) rds.ECCtext = ECCtext[190];
break;
}
case 'A': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 162) rds.ECCtext = ECCtext[131];
if (rds.ECC == 163) rds.ECCtext = ECCtext[144];
if (rds.ECC == 164) rds.ECCtext = ECCtext[166];
if (rds.ECC == 208) rds.ECCtext = ECCtext[85];
if (rds.ECC == 209) rds.ECCtext = ECCtext[97];
if (rds.ECC == 210) rds.ECCtext = ECCtext[121];
if (rds.ECC == 211) rds.ECCtext = ECCtext[70];
if (rds.ECC == 212) rds.ECCtext = ECCtext[86];
if (rds.ECC == 224) rds.ECCtext = ECCtext[38];
if (rds.ECC == 225) rds.ECCtext = ECCtext[39];
if (rds.ECC == 226) rds.ECCtext = ECCtext[40];
if (rds.ECC == 227) rds.ECCtext = ECCtext[41];
if (rds.ECC == 228) rds.ECCtext = ECCtext[60];
if (rds.ECC == 240) rds.ECCtext = ECCtext[178];
if (rds.ECC == 241) rds.ECCtext = ECCtext[215];
if (rds.ECC == 242) rds.ECCtext = ECCtext[214];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[131];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[144];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[166];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[85];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[97];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[121];
else if (rds.ECC == 0xD3) rds.ECCtext = ECCtext[70];
else if (rds.ECC == 0xD4) rds.ECCtext = ECCtext[86];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[38];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[39];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[40];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[41];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[60];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[178];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[215];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[214];
break;
}
case 'B': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 161) rds.ECCtext = ECCtext[138];
if (rds.ECC == 162) rds.ECCtext = ECCtext[137];
if (rds.ECC == 163) rds.ECCtext = ECCtext[145];
if (rds.ECC == 164) rds.ECCtext = ECCtext[167];
if (rds.ECC == 165) rds.ECCtext = ECCtext[158];
if (rds.ECC == 208) rds.ECCtext = ECCtext[101];
if (rds.ECC == 210) rds.ECCtext = ECCtext[109];
if (rds.ECC == 209) rds.ECCtext = ECCtext[100];
if (rds.ECC == 224) rds.ECCtext = ECCtext[42];
if (rds.ECC == 225) rds.ECCtext = ECCtext[43];
if (rds.ECC == 226) rds.ECCtext = ECCtext[44];
if (rds.ECC == 227) rds.ECCtext = ECCtext[61];
if (rds.ECC == 228) rds.ECCtext = ECCtext[66];
if (rds.ECC == 240) rds.ECCtext = ECCtext[206];
if (rds.ECC == 241) rds.ECCtext = ECCtext[188];
if (rds.ECC == 242) rds.ECCtext = ECCtext[203];
if (rds.ECC == 243) rds.ECCtext = ECCtext[93];
if (rds.ECC == 244) rds.ECCtext = ECCtext[204];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA1) rds.ECCtext = ECCtext[138];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[137];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[145];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[167];
else if (rds.ECC == 0xA5) rds.ECCtext = ECCtext[158];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[101];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[100];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[109];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[42];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[43];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[44];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[61];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[66];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[206];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[188];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[203];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[93];
else if (rds.ECC == 0xF4) rds.ECCtext = ECCtext[204];
break;
}
case 'C': {
if (rds.ECC == 161) rds.ECCtext = ECCtext[138];
if (rds.ECC == 162) rds.ECCtext = ECCtext[223];
if (rds.ECC == 163) rds.ECCtext = ECCtext[140];
if (rds.ECC == 164) rds.ECCtext = ECCtext[146];
if (rds.ECC == 165) rds.ECCtext = ECCtext[169];
if (rds.ECC == 208) rds.ECCtext = ECCtext[110];
if (rds.ECC == 209) rds.ECCtext = ECCtext[108];
if (rds.ECC == 210) rds.ECCtext = ECCtext[111];
if (rds.ECC == 211) rds.ECCtext = ECCtext[87];
if (rds.ECC == 224) rds.ECCtext = ECCtext[45];
if (rds.ECC == 225) rds.ECCtext = ECCtext[46];
if (rds.ECC == 226) rds.ECCtext = ECCtext[47];
if (rds.ECC == 227) rds.ECCtext = ECCtext[48];
if (rds.ECC == 228) rds.ECCtext = ECCtext[118];
if (rds.ECC == 240) rds.ECCtext = ECCtext[190];
if (rds.ECC == 241) rds.ECCtext = ECCtext[216];
if (rds.ECC == 242) rds.ECCtext = ECCtext[194];
if (rds.ECC == 0xA1) rds.ECCtext = ECCtext[138];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[223];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[140];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[146];
else if (rds.ECC == 0xA5) rds.ECCtext = ECCtext[169];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[110];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[108];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[111];
else if (rds.ECC == 0xD3) rds.ECCtext = ECCtext[87];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[45];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[46];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[47];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[48];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[118];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[190];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[216];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[194];
break;
}
case 'D': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 161) rds.ECCtext = ECCtext[138];
if (rds.ECC == 162) rds.ECCtext = ECCtext[225];
if (rds.ECC == 163) rds.ECCtext = ECCtext[150];
if (rds.ECC == 164) rds.ECCtext = ECCtext[154];
if (rds.ECC == 165) rds.ECCtext = ECCtext[158];
if (rds.ECC == 208) rds.ECCtext = ECCtext[90];
if (rds.ECC == 209) rds.ECCtext = ECCtext[89];
if (rds.ECC == 224) rds.ECCtext = ECCtext[0];
if (rds.ECC == 225) rds.ECCtext = ECCtext[49];
if (rds.ECC == 226) rds.ECCtext = ECCtext[23];
if (rds.ECC == 227) rds.ECCtext = ECCtext[122];
if (rds.ECC == 240) rds.ECCtext = ECCtext[198];
if (rds.ECC == 241) rds.ECCtext = ECCtext[217];
if (rds.ECC == 242) rds.ECCtext = ECCtext[128];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA1) rds.ECCtext = ECCtext[138];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[225];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[150];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[154];
else if (rds.ECC == 0xA5) rds.ECCtext = ECCtext[158];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[90];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[89];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[0];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[49];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[23];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[122];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[198];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[217];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[128];
break;
}
case 'E': {
if (rds.ECC == 160) rds.ECCtext = ECCtext[226];
if (rds.ECC == 161) rds.ECCtext = ECCtext[138];
if (rds.ECC == 162) rds.ECCtext = ECCtext[151];
if (rds.ECC == 163) rds.ECCtext = ECCtext[172];
if (rds.ECC == 164) rds.ECCtext = ECCtext[175];
if (rds.ECC == 165) rds.ECCtext = ECCtext[158];
if (rds.ECC == 208) rds.ECCtext = ECCtext[99];
if (rds.ECC == 209) rds.ECCtext = ECCtext[115];
if (rds.ECC == 210) rds.ECCtext = ECCtext[94];
if (rds.ECC == 224) rds.ECCtext = ECCtext[50];
if (rds.ECC == 225) rds.ECCtext = ECCtext[51];
if (rds.ECC == 226) rds.ECCtext = ECCtext[52];
if (rds.ECC == 227) rds.ECCtext = ECCtext[53];
if (rds.ECC == 228) rds.ECCtext = ECCtext[64];
if (rds.ECC == 240) rds.ECCtext = ECCtext[98];
if (rds.ECC == 241) rds.ECCtext = ECCtext[199];
if (rds.ECC == 242) rds.ECCtext = ECCtext[208];
if (rds.ECC == 243) rds.ECCtext = ECCtext[205];
if (rds.ECC == 0xA0) rds.ECCtext = ECCtext[226];
else if (rds.ECC == 0xA1) rds.ECCtext = ECCtext[138];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[151];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[172];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[175];
else if (rds.ECC == 0xA5) rds.ECCtext = ECCtext[158];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[99];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[115];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[94];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[50];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[51];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[52];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[53];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[64];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[98];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[199];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[208];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[205];
break;
}
case 'F': {
if (rds.ECC == 161) rds.ECCtext = ECCtext[149];
if (rds.ECC == 162) rds.ECCtext = ECCtext[222];
if (rds.ECC == 163) rds.ECCtext = ECCtext[153];
if (rds.ECC == 164) rds.ECCtext = ECCtext[176];
if (rds.ECC == 165) rds.ECCtext = ECCtext[158];
if (rds.ECC == 166) rds.ECCtext = ECCtext[168];
if (rds.ECC == 208) rds.ECCtext = ECCtext[67];
if (rds.ECC == 209) rds.ECCtext = ECCtext[75];
if (rds.ECC == 210) rds.ECCtext = ECCtext[114];
if (rds.ECC == 224) rds.ECCtext = ECCtext[54];
if (rds.ECC == 225) rds.ECCtext = ECCtext[55];
if (rds.ECC == 226) rds.ECCtext = ECCtext[56];
if (rds.ECC == 227) rds.ECCtext = ECCtext[57];
if (rds.ECC == 228) rds.ECCtext = ECCtext[58];
if (rds.ECC == 240) rds.ECCtext = ECCtext[202];
if (rds.ECC == 241) rds.ECCtext = ECCtext[192];
if (rds.ECC == 242) rds.ECCtext = ECCtext[220];
if (rds.ECC == 243) rds.ECCtext = ECCtext[71];
if (rds.ECC == 0xA1) rds.ECCtext = ECCtext[149];
else if (rds.ECC == 0xA2) rds.ECCtext = ECCtext[222];
else if (rds.ECC == 0xA3) rds.ECCtext = ECCtext[153];
else if (rds.ECC == 0xA4) rds.ECCtext = ECCtext[176];
else if (rds.ECC == 0xA5) rds.ECCtext = ECCtext[158];
else if (rds.ECC == 0xA6) rds.ECCtext = ECCtext[168];
else if (rds.ECC == 0xD0) rds.ECCtext = ECCtext[67];
else if (rds.ECC == 0xD1) rds.ECCtext = ECCtext[75];
else if (rds.ECC == 0xD2) rds.ECCtext = ECCtext[114];
else if (rds.ECC == 0xE0) rds.ECCtext = ECCtext[54];
else if (rds.ECC == 0xE1) rds.ECCtext = ECCtext[55];
else if (rds.ECC == 0xE2) rds.ECCtext = ECCtext[56];
else if (rds.ECC == 0xE3) rds.ECCtext = ECCtext[57];
else if (rds.ECC == 0xE4) rds.ECCtext = ECCtext[58];
else if (rds.ECC == 0xF0) rds.ECCtext = ECCtext[202];
else if (rds.ECC == 0xF1) rds.ECCtext = ECCtext[192];
else if (rds.ECC == 0xF2) rds.ECCtext = ECCtext[220];
else if (rds.ECC == 0xF3) rds.ECCtext = ECCtext[71];
break;
}
default: {
src/gui.cpp
+2 -5
View File
@@ -3001,11 +3001,8 @@ void BuildAdvancedRDS() {
tft.drawBitmap(68, 5, RDSLogo, 35, 22, GreyoutColor);
tft.drawBitmap(249, 4, Speaker, 28, 24, GreyoutColor);
if (!StereoToggle) {
tft.drawBitmap(38, 5, Mono, 22, 22, SecondaryColor);
} else {
tft.drawBitmap(32, 5, Stereo, 32, 22, GreyoutColor);
}
if (!StereoToggle) tft.drawBitmap(38, 5, Mono, 22, 22, SecondaryColor);
else tft.drawBitmap(32, 5, Stereo, 32, 22, GreyoutColor);
tftPrint(ALEFT, "TP", 2, 51, GreyoutColor, BackgroundColor, 16);
tftPrint(ALEFT, "TA", 24, 51, GreyoutColor, BackgroundColor, 16);
src/main.cpp
+3
View File
@@ -281,6 +281,7 @@ int xPos2;
int xPos3;
int xPos4;
int xPos5;
int xPos6;
int16_t OStatus;
int16_t SAvg;
int16_t SAvg2;
@@ -388,6 +389,8 @@ unsigned long aftickerhold;
unsigned long aftimer;
unsigned long autosquelchtimer;
unsigned long blockcounterold[33];
unsigned long eccticker;
unsigned long ecctickerhold;
unsigned long eonticker;
unsigned long eontickerhold;
unsigned long flashingtimer;
src/rds.cpp
+37 -12
View File
@@ -5,7 +5,7 @@
String HexStringold;
float smoothBER = 0;
int RadiotextWidth, PSLongWidth, AIDWidth, afstringWidth, eonstringWidth, rtplusstringWidth, lengths[7];
int RadiotextWidth, PSLongWidth, AIDWidth, afstringWidth, eccstringWidth, eonstringWidth, rtplusstringWidth, lengths[7];
String afstringold, eonstringold, rtplusstringold, stationNameLongOld, AIDStringold;
bool rtABold, ps12errorold, ps34errorold, ps56errorold, ps78errorold;
@@ -57,17 +57,42 @@ void ShowAdvancedRDS() {
}
if (ECCold != radio.rds.ECC) {
if (advancedRDS) {
if (!screenmute) {
if (radio.rds.hasECC) ECCString = (radio.rds.ECCtext.length() == 0 ? textUI(73) : radio.rds.ECCtext); else ECCString = "N/A";
if (ECCString != ECColdString) {
tftPrint(ALEFT, "N/A", 35, 199, BackgroundColor, BackgroundColor, 16);
tftPrint(ALEFT, ECColdString, 35, 199, BackgroundColor, BackgroundColor, 16);
if (!screenmute) {
if (radio.rds.hasECC) ECCString = (radio.rds.ECCtext.length() == 0 ? textUI(73) : radio.rds.ECCtext); else ECCString = "N/A";
if (ECCString != ECColdString) {
tftPrint(ALEFT, "N/A", 35, 199, BackgroundColor, BackgroundColor, 16);
tftPrint(ALEFT, ECColdString, 35, 199, BackgroundColor, BackgroundColor, 16);
eccstringWidth = RDSSprite.textWidth(ECCString);
}
if (eccstringWidth < 270) {
xPos6 = 0;
RDSSprite.fillSprite(BackgroundColor);
if (RDSstatus) RDSSprite.setTextColor(RDSColor, RDSColorSmooth, false); else RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
RDSSprite.drawString(ECCString, xPos6, 2);
RDSSprite.pushSprite(35, 199);
} else {
if (millis() - eccticker >= 5) {
if (xPos6 < -eccstringWidth) xPos6 = 0;
if (xPos6 == 0) {
if (millis() - ecctickerhold >= 2000) {
xPos6--;
ecctickerhold = millis();
}
} else {
xPos6--;
ecctickerhold = millis();
}
RDSSprite.fillSprite(BackgroundColor);
if (RDSstatus) RDSSprite.setTextColor(RDSColor, RDSColorSmooth, false); else RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
RDSSprite.drawString(ECCString, xPos6, 2);
RDSSprite.drawString(ECCString, xPos6 + eccstringWidth, 2);
RDSSprite.pushSprite(35, 199);
eccticker = millis();
}
tftPrint(ALEFT, ECCString, 35, 199, RDSColor, RDSColorSmooth, 16);
}
ECColdString = ECCString;
}
ECColdString = ECCString;
if (wifi) {
Udp.beginPacket(remoteip, 9030);
@@ -1023,11 +1048,11 @@ void ShowRDSStatistics() {
String HexString;
HexString = String(((radio.rds.rdsA >> 12) & 0xF), HEX) + String(((radio.rds.rdsA >> 8) & 0xF), HEX) + String(((radio.rds.rdsA >> 4) & 0xF), HEX) + String((radio.rds.rdsA & 0xF), HEX);
HexString += " ";
HexString = String(((radio.rds.rdsB >> 12) & 0xF), HEX) + String(((radio.rds.rdsB >> 8) & 0xF), HEX) + String(((radio.rds.rdsB >> 4) & 0xF), HEX) + String((radio.rds.rdsB & 0xF), HEX);
HexString += String(((radio.rds.rdsB >> 12) & 0xF), HEX) + String(((radio.rds.rdsB >> 8) & 0xF), HEX) + String(((radio.rds.rdsB >> 4) & 0xF), HEX) + String((radio.rds.rdsB & 0xF), HEX);
HexString += " ";
HexString = String(((radio.rds.rdsC >> 12) & 0xF), HEX) + String(((radio.rds.rdsC >> 8) & 0xF), HEX) + String(((radio.rds.rdsC >> 4) & 0xF), HEX) + String((radio.rds.rdsC & 0xF), HEX);
HexString += String(((radio.rds.rdsC >> 12) & 0xF), HEX) + String(((radio.rds.rdsC >> 8) & 0xF), HEX) + String(((radio.rds.rdsC >> 4) & 0xF), HEX) + String((radio.rds.rdsC & 0xF), HEX);
HexString += " ";
HexString = String(((radio.rds.rdsD >> 12) & 0xF), HEX) + String(((radio.rds.rdsD >> 8) & 0xF), HEX) + String(((radio.rds.rdsD >> 4) & 0xF), HEX) + String((radio.rds.rdsD & 0xF), HEX);
HexString += String(((radio.rds.rdsD >> 12) & 0xF), HEX) + String(((radio.rds.rdsD >> 8) & 0xF), HEX) + String(((radio.rds.rdsD >> 4) & 0xF), HEX) + String((radio.rds.rdsD & 0xF), HEX);
HexString.toUpperCase();