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

RDS data for XDRGTK changed to uppercase

Browse Source 
Fix a init problem cuased by X-tal selector. Needs some additional work
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-01-27 17:48:03 +01:00
parent dbf8cf61da
commit e473812904
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/TEF6686.cpp
View File

@@ -132,6 +132,7 @@ void TEF6686::init(byte TEF) {
delay(50);
xtalADC = analogRead(15);
Serial.println(xtalADC);
if (xtalADC > XTAL_0V_ADC && xtalADC < XTAL_0V_ADC + XTAL_ADC_TOL) {
Tuner_Init(tuner_init_tab9216);
log_v("XTAL : 9.216M");
@@ -141,7 +142,7 @@ void TEF6686::init(byte TEF) {
} else if (xtalADC > XTAL_2V_ADC - XTAL_ADC_TOL && xtalADC < XTAL_2V_ADC + XTAL_ADC_TOL) {
Tuner_Init(tuner_init_tab55000);
log_v("XTAL : 55M");
} else if (xtalADC > XTAL_2V_ADC + XTAL_ADC_TOL) {
} else {
Tuner_Init(tuner_init_tab4000);
log_v("XTAL : 4M");
}

3
src/comms.cpp
View File

@@ -616,4 +616,5 @@ void tryWiFi() {
Server.end();
Udp.stop();
WiFi.mode(WIFI_OFF);
}
}
}

7
src/rds.cpp
View File

@@ -429,8 +429,10 @@ void readRds() {
if (piState != RdsPiBuffer::STATE_INVALID) {
DataPrint ("P");
DataPrint (String(((radio.rds.rdsA >> 8) >> 4) & 0xF, HEX) + String((radio.rds.rdsA >> 8) & 0xF, HEX));
DataPrint (String(((radio.rds.rdsA) >> 4) & 0xF, HEX) + String((radio.rds.rdsA) & 0xF, HEX));
String PIcodeToSend;
PIcodeToSend = String(((radio.rds.rdsA >> 8) >> 4) & 0xF, HEX) + String((radio.rds.rdsA >> 8) & 0xF, HEX) + String(((radio.rds.rdsA) >> 4) & 0xF, HEX) + String((radio.rds.rdsA) & 0xF, HEX);
PIcodeToSend.toUpperCase();
DataPrint (PIcodeToSend);
while (piState != 0) {
DataPrint("?");
piState--;
@@ -438,6 +440,7 @@ void readRds() {
DataPrint ("\n");
}
}
XDRGTKRDS.toUpperCase();
DataPrint(XDRGTKRDS);
XDRGTKRDSold = XDRGTKRDS;
}