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

76
src/TEF6686.cpp
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,17 +98,22 @@ 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) {
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;
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[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 {
af[highestIndex].afvalid = false;
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, currentfreq);
}
}
@@ -337,8 +384,8 @@ void TEF6686::readRDS(bool showrdserrors)
if (rdsReady) { // We have all data to decode... let's go...
//PI decoder
if (rds.correct) rds.correctPI = rds.rdsA;
if (rds.correct) rds.correctPI = rds.rdsA;
if (rds.region != 1 && (!rds.rdsAerror || rds.pierrors)) {
if (rds.rdsA != piold) {
piold = rds.rdsA;
@@ -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;

26
src/TEF6686.h
View File

@@ -147,6 +147,7 @@ typedef struct _af_ {
int16_t score;
bool filler;
bool afvalid;
bool checked;
} af_;
typedef struct _eon_ {
@@ -156,14 +157,16 @@ typedef struct _eon_ {
uint16_t pi;
char picode[6];
String ps;
bool eonvalid;
bool checked;
} eon_;
typedef struct _logbook_ {
char picode[6];
uint16_t frequency;
int16_t SignalLevel;
String stationName;
String DateTime;
char picode[6];
uint16_t frequency;
int16_t SignalLevel;
String stationName;
String DateTime;
} logbook_;
class TEF6686 {
@@ -171,8 +174,9 @@ class TEF6686 {
af_ af[50];
eon_ eon[20];
rds_ rds;
logbook_ logbook[22];
uint16_t TestAF();
logbook_ logbook[22];
uint16_t TestAF();
void TestAFEON();
void readRDS(bool showrdserrors);
void SetFreq(uint16_t frequency);
void SetFreqAM(uint16_t frequency);
@@ -205,7 +209,7 @@ class TEF6686 {
void setAMAttenuation(uint16_t start);
void setMute();
void setOffset(int8_t offset);
void setAMOffset(int8_t offset);
void setAMOffset(int8_t offset);
void setFMSI(uint8_t mode);
void setFMSI_Time(uint16_t attack, uint16_t decay);
void setFMSI_Gain(uint16_t band1, uint16_t band2, uint16_t band3, uint16_t band4);
@@ -216,7 +220,7 @@ class TEF6686 {
void tone(uint16_t time, int16_t amplitude, uint16_t frequency);
uint8_t af_counter;
uint8_t eon_counter;
uint8_t logbook_counter;
uint8_t logbook_counter;
uint8_t rdsblock;
uint8_t rtplusblock;
bool mute;
@@ -234,14 +238,14 @@ class TEF6686 {
bool rt_process;
char rt_buffer[65];
char rt_buffer2[65];
char rt_buffer32[33];
char rt_buffer32[33];
bool useRTPlus = true;
bool ABold;
char stationTextBuffer[65];
uint16_t rdsBprevious;
uint16_t rdsCprevious;
uint16_t rdsDprevious;
uint16_t piold;
uint16_t piold;
bool rtABold;
wchar_t PStext[9] = L"";
wchar_t EONPStext[20][9];