Merge branch 'PE5PVB:main' into main

This commit is contained in:
Jan Ove Overland
2023-08-10 20:39:14 +02:00
committed by GitHub
3 changed files with 2 additions and 20 deletions

View File

@@ -50,24 +50,6 @@ void TEF6686::TestAFEON() {
if (!mute) devTEF_Audio_Set_Mute(0);
}
uint16_t TEF6686::CheckSignal(uint16_t frequency) {
uint16_t status;
uint16_t dummy1;
uint16_t dummy2;
uint8_t dummy3;
int16_t level;
uint16_t usn;
uint16_t wam;
int16_t offset;
byte timing = 0;
devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 3, frequency);
while (timing == 0 && !bitRead(timing, 15)) {
devTEF_Radio_Get_Quality_Status(&status, &level, &usn, &wam, &offset, &dummy1, &dummy2, &dummy3);
timing = lowByte(status);
}
return level;
}
uint16_t TEF6686::TestAF() {
if (af_counter != 0) {
uint16_t status;

View File

@@ -201,7 +201,6 @@ class TEF6686 {
eon_ eon[20];
rds_ rds;
logbook_ logbook[22];
uint16_t CheckSignal(uint16_t frequency);
uint16_t TestAF();
void TestAFEON();
void readRDS(bool showrdserrors);

View File

@@ -411,10 +411,11 @@ void XDRGTKRoutine() {
}
frequencyold = frequency;
for (freq_scan = scanner_start; freq_scan <= scanner_end; freq_scan += scanner_step) {
radio.SetFreq(freq_scan);
DataPrint(String(freq_scan * 10, DEC));
DataPrint(" = ");
if (band < BAND_GAP) radio.getStatus(SStatus, USN, WAM, OStatus, BW, MStatus, SNR); else radio.getStatusAM(SStatus, USN, WAM, OStatus, BW, MStatus, SNR);
DataPrint(String((radio.CheckSignal(freq_scan) / 10) + 10, DEC));
DataPrint(String((SStatus / 10) + 10, DEC));
DataPrint(", ");
}
DataPrint("\n");