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

Fixed some problems with arrays in EON

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-07-18 11:17:48 +02:00
parent e31c21a65a
commit 8b1dde6648
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+3 -3
View File
@@ -258,7 +258,7 @@ unsigned int LowEdgeOIRTSet;
unsigned int LowEdgeSet; unsigned int LowEdgeSet;
unsigned int LWHighEdgeSet; unsigned int LWHighEdgeSet;
unsigned int LWLowEdgeSet; unsigned int LWLowEdgeSet;
unsigned int mappedfreqold[10]; unsigned int mappedfreqold[20];
unsigned int memory[EE_PRESETS_CNT]; unsigned int memory[EE_PRESETS_CNT];
unsigned int MWHighEdgeSet; unsigned int MWHighEdgeSet;
unsigned int MWLowEdgeSet; unsigned int MWLowEdgeSet;
@@ -3266,7 +3266,7 @@ void ShowAdvancedRDS() {
} }
String rtplusstring; String rtplusstring;
if (radio.rds.hasRDSplus) rtplusstring = "1\) " + String(radio.rds.RTContent1) + " - 2\) " + String(radio.rds.RTContent2) + " "; else rtplusstring = myLanguage[language][89]; if (radio.rds.hasRDSplus) rtplusstring = "1) " + String(radio.rds.RTContent1) + " - 2) " + String(radio.rds.RTContent2) + " "; else rtplusstring = myLanguage[language][89];
if (hasrtplusold != radio.rds.hasRDSplus) { if (hasrtplusold != radio.rds.hasRDSplus) {
if (radio.rds.hasRDSplus) tft.setTextColor(SecondaryColor); else tft.setTextColor(GreyoutColor); if (radio.rds.hasRDSplus) tft.setTextColor(SecondaryColor); else tft.setTextColor(GreyoutColor);
tft.drawString("RT+", 116, 45, GFXFF); tft.drawString("RT+", 116, 45, GFXFF);
@@ -3865,7 +3865,7 @@ void BuildAFScreen() {
tft.drawRoundRect(35, 32, 138, 20, 5, ActiveColor); tft.drawRoundRect(35, 32, 138, 20, 5, ActiveColor);
for (byte i = 0; i < 11; i++) mappedfreqold[i] = 0; for (byte i = 0; i < 20; i++) mappedfreqold[i] = 0;
RDSstatusold = false; RDSstatusold = false;
ShowFreq(0); ShowFreq(0);
Stereostatusold = false; Stereostatusold = false;
src/TEF6686.cpp
+3 -5
View File
@@ -845,7 +845,7 @@ void TEF6686::clearRDS (bool fullsearchrds)
for (i = 0; i < 65; i++) rt_buffer[i] = 0; for (i = 0; i < 65; i++) rt_buffer[i] = 0;
for (i = 0; i < 33; i++) rt_buffer32[i] = 0; for (i = 0; i < 33; i++) rt_buffer32[i] = 0;
for (i = 0; i < 18; i++) rds.stationType[i] = 0; for (i = 0; i < 18; i++) rds.stationType[i] = 0;
for (i = 0; i < 7; i++) rds.picode[i] = 0; for (i = 0; i < 6; i++) rds.picode[i] = 0;
for (i = 0; i < 50; i++) { for (i = 0; i < 50; i++) {
af[i].frequency = 0; af[i].frequency = 0;
@@ -862,10 +862,8 @@ void TEF6686::clearRDS (bool fullsearchrds)
eon[i].mappedfreq2 = 0; eon[i].mappedfreq2 = 0;
eon[i].mappedfreq3 = 0; eon[i].mappedfreq3 = 0;
eon[i].checked = false; eon[i].checked = false;
for (int y = 0; y < 9; y++) { for (int y = 0; y < 5; y++) {
eon_buffer[i][y] = 0; eon[i].picode[y] = '\0';
eon_buffer2[i][y] = 0;
EONPStext[i][y] = L'\0';
} }
} }