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

Bugfixing

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-07-16 23:17:17 +02:00
parent 7583d80646
commit 29603bddf9
3 changed files with 117 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+23 -14
View File
@@ -3218,14 +3218,14 @@ void ShowAdvancedRDS() {
tft.drawString("AF", 42, 45, GFXFF);
hasafold = radio.rds.hasAF;
}
if (millis() - afticker >= 500) {
if (millis() - afticker >= 100) { //500
if (xPos2 == 6) {
if (millis() - aftickerhold >= 2000) {
xPos2 -= charWidth;
xPos2 -= 1;//charWidth;
aftickerhold = millis();
}
} else {
xPos2 -= charWidth;
xPos2 -= 1;//charWidth;
aftickerhold = millis();
}
if (xPos2 < -tft.textWidth(afstring) + (charWidth * 14)) xPos2 = 6;
@@ -3245,14 +3245,14 @@ void ShowAdvancedRDS() {
tft.drawString("EON", 148, 45, GFXFF);
haseonold = radio.rds.hasEON;
}
if (millis() - eonticker >= 500) {
if (millis() - eonticker >= 100) { //500
if (xPos3 == 6) {
if (millis() - eontickerhold >= 2000) {
xPos3 -= charWidth;
xPos3 -= 1;//charWidth;
eontickerhold = millis();
}
} else {
xPos3 -= charWidth;
xPos3 -= 1;//charWidth;
eontickerhold = millis();
}
if (xPos3 < -tft.textWidth(eonstring) + (charWidth * 14)) xPos3 = 6;
@@ -3272,14 +3272,14 @@ void ShowAdvancedRDS() {
tft.drawString("RT+", 116, 45, GFXFF);
hasrtplusold = radio.rds.hasRDSplus;
}
if (millis() - rtplusticker >= 350) {
if (millis() - rtplusticker >= 100) { //350
if (xPos3 == 6) {
if (millis() - rtplustickerhold >= 2000) {
xPos4 -= charWidth;
xPos4 -= 1;//charWidth;
rtplustickerhold = millis();
}
} else {
xPos4 -= charWidth;
xPos4 -= 1;//charWidth;
rtplustickerhold = millis();
}
if (xPos4 < -tft.textWidth(rtplusstring) + (charWidth * 14)) xPos4 = 6;
@@ -3565,14 +3565,14 @@ void showPS() {
void showRadioText() {
if (radio.rds.hasRT && RDSstatus) {
if (millis() - rtticker >= 350) {
if (millis() - rtticker >= 100) { // 350
if (xPos == 6) {
if (millis() - rttickerhold >= 2000) {
xPos -= charWidth;
xPos -= 1;//= charWidth;
rttickerhold = millis();
}
} else {
xPos -= charWidth;
xPos -= 1;//= charWidth;
rttickerhold = millis();
}
@@ -3779,10 +3779,10 @@ void ShowAFEON() {
}
if (af_counterold != radio.af_counter) {
Serial.println(radio.af_counter);
tft.fillRect(2, 53, 177, 165, BackgroundColor);
for (byte i = 0; i < radio.af_counter; i++) {
byte x = i - (afpagenr == 2 ? 33 : 0);
if (radio.af[i].checked) tft.setTextColor(TFT_GREEN); else if (!radio.af[i].afvalid) tft.setTextColor(TFT_RED); else tft.setTextColor(PrimaryColor);
tft.drawRightString((radio.af[i].filler ? "(f) " : "") + String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10), 56 + (x > 10 ? 60 : 0) + (x > 21 ? 60 : 0), 48 + (15 * x) - (x > 10 ? 165 : 0) - (x > 21 ? 165 : 0), GFXFF);
if (i == 32 + (afpagenr == 2 ? 33 : 0)) i = 254;
}
@@ -3834,6 +3834,14 @@ void ShowAFEON() {
}
void BuildAFScreen() {
if (!afscreen && RDSstatus) {
tft.drawRoundRect(20, 30, 274, 170, 5, ActiveColor);
tft.fillRoundRect(22, 32, 270, 166, 5, BackgroundColor);
tft.setFreeFont(FONT14);
tft.setTextColor(ActiveColor);
tft.drawCentreString(myLanguage[language][34], 155, 90, GFXFF);
radio.TestAFEON();
}
afscreen = true;
advancedRDS = false;
if (theme == 0) {
@@ -4767,6 +4775,7 @@ void updateEQ() {
}
void updateSWMIBand() {
tft.setFreeFont(FONT7);
switch (SWMIBandPos) {
case SW_MI_BAND_11M:
case SW_MI_BAND_13M:
@@ -5130,7 +5139,7 @@ void Communication() {
XDRGTKTCP = true;
RemoteClient.print("o1,0\n");
store = true;
} else if (RDSSPYTCP == false && XDRGTKTCP == false && data_str.length() < 5 && data_str == ("*R ? F"))
} else if (RDSSPYTCP == false && XDRGTKTCP == false && data_str.length() < 5 && data_str == ("*D*R?F"))
{
RDSSPYTCP = true;
} else if (RDSSPYTCP == true) {
src/TEF6686.cpp
+55 -3
View File
@@ -7,8 +7,50 @@ unsigned long rdstimer = 0;
unsigned long bitStartTime = 0;
bool lastBitState = false;
uint16_t TEF6686::TestAF() {
void TEF6686::TestAFEON() {
uint16_t status;
uint16_t rdsStat;
uint16_t dummy1;
uint16_t dummy2;
uint8_t dummy3;
int16_t aflevel;
uint16_t afusn;
uint16_t afwam;
int16_t afoffset;
byte timing;
if (af_counter != 0) {
devTEF_Audio_Set_Mute(1);
for (int x = 0; x < af_counter; x++) {
timing = 0;
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 3, af[x].frequency);
while (timing == 0 && !bitRead(timing, 15)) {
devTEF_Radio_Get_Quality_Status(&status, &aflevel, &afusn, &afwam, &afoffset, &dummy1, &dummy2, &dummy3);
timing = lowByte(status);
}
if (afoffset > -125 || afoffset < 125) {
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, af[x].frequency);
delay(200);
devTEF_Radio_Get_RDS_Status(&rdsStat, &rds.rdsA, &rds.rdsB, &rds.rdsC, &rds.rdsD, &rds.rdsErr);
if (rdsStat & (1 << 9)) {
if (rds.rdsA == rds.correctPI) {
af[x].checked = true;
af[x].afvalid = true;
} else {
af[x].checked = false;
af[x].afvalid = false;
}
} else {
af[x].checked = false;
}
}
}
}
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, currentfreq);
if (!mute) devTEF_Audio_Set_Mute(0);
}
uint16_t TEF6686::TestAF() {
if (af_counter != 0) {
uint16_t status;
uint16_t rdsStat;
@@ -56,19 +98,24 @@ uint16_t TEF6686::TestAF() {
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, af[highestIndex].frequency);
delay(200);
devTEF_Radio_Get_RDS_Status(&rdsStat, &rds.rdsA, &rds.rdsB, &rds.rdsC, &rds.rdsD, &rds.rdsErr);
if ((rdsStat & (1 << 9)) && rds.rdsA == rds.correctPI) {
if (rdsStat & (1 << 9)) {
if (rds.rdsA == rds.correctPI) {
currentfreq = af[highestIndex].frequency;
for (byte y = 0; y < 50; y++) {
af[y].frequency = 0;
af[y].score = -32767;
af[y].afvalid = true;
af[y].filler = false;
af_counter = 0;
af[y].checked = false;
}
af_counter = 0; // Reset af_counter only once after the loop.
} else {
af[highestIndex].afvalid = false;
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, currentfreq);
}
} else {
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, currentfreq);
}
}
}
return currentfreq;
@@ -509,12 +556,15 @@ void TEF6686::readRDS(bool showrdserrors)
uint16_t temp = af[j].frequency;
bool temp2 = af[j].filler;
bool temp3 = af[j].afvalid;
bool temp4 = af[j].checked;
af[j].frequency = af[j + 1].frequency;
af[j].filler = af[j + 1].filler;
af[j].afvalid = af[j + 1].afvalid;
af[j].checked = af[j + 1].checked;
af[j + 1].frequency = temp;
af[j + 1].filler = temp2;
af[j + 1].afvalid = temp3;
af[j + 1].checked = temp4;
}
}
}
@@ -802,6 +852,7 @@ void TEF6686::clearRDS (bool fullsearchrds)
af[i].score = -32767;
af[i].filler = false;
af[i].afvalid = true;
af[i].checked = false;
}
for (i = 0; i < 20; i++) {
@@ -810,6 +861,7 @@ void TEF6686::clearRDS (bool fullsearchrds)
eon[i].mappedfreq = 0;
eon[i].mappedfreq2 = 0;
eon[i].mappedfreq3 = 0;
eon[i].checked = false;
for (int y = 0; y < 9; y++) {
eon_buffer[i][y] = 0;
eon_buffer2[i][y] = 0;
src/TEF6686.h
+4
View File
@@ -147,6 +147,7 @@ typedef struct _af_ {
int16_t score;
bool filler;
bool afvalid;
bool checked;
} af_;
typedef struct _eon_ {
@@ -156,6 +157,8 @@ typedef struct _eon_ {
uint16_t pi;
char picode[6];
String ps;
bool eonvalid;
bool checked;
} eon_;
typedef struct _logbook_ {
@@ -173,6 +176,7 @@ class TEF6686 {
rds_ rds;
logbook_ logbook[22];
uint16_t TestAF();
void TestAFEON();
void readRDS(bool showrdserrors);
void SetFreq(uint16_t frequency);
void SetFreqAM(uint16_t frequency);