RDS data for XDRGTK changed to uppercase
Fix a init problem cuased by X-tal selector. Needs some additional work
This commit is contained in:
+2
-1
@@ -132,6 +132,7 @@ void TEF6686::init(byte TEF) {
|
|||||||
delay(50);
|
delay(50);
|
||||||
|
|
||||||
xtalADC = analogRead(15);
|
xtalADC = analogRead(15);
|
||||||
|
Serial.println(xtalADC);
|
||||||
if (xtalADC > XTAL_0V_ADC && xtalADC < XTAL_0V_ADC + XTAL_ADC_TOL) {
|
if (xtalADC > XTAL_0V_ADC && xtalADC < XTAL_0V_ADC + XTAL_ADC_TOL) {
|
||||||
Tuner_Init(tuner_init_tab9216);
|
Tuner_Init(tuner_init_tab9216);
|
||||||
log_v("XTAL : 9.216M");
|
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) {
|
} else if (xtalADC > XTAL_2V_ADC - XTAL_ADC_TOL && xtalADC < XTAL_2V_ADC + XTAL_ADC_TOL) {
|
||||||
Tuner_Init(tuner_init_tab55000);
|
Tuner_Init(tuner_init_tab55000);
|
||||||
log_v("XTAL : 55M");
|
log_v("XTAL : 55M");
|
||||||
} else if (xtalADC > XTAL_2V_ADC + XTAL_ADC_TOL) {
|
} else {
|
||||||
Tuner_Init(tuner_init_tab4000);
|
Tuner_Init(tuner_init_tab4000);
|
||||||
log_v("XTAL : 4M");
|
log_v("XTAL : 4M");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -617,3 +617,4 @@ void tryWiFi() {
|
|||||||
Udp.stop();
|
Udp.stop();
|
||||||
WiFi.mode(WIFI_OFF);
|
WiFi.mode(WIFI_OFF);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
+5
-2
@@ -429,8 +429,10 @@ void readRds() {
|
|||||||
|
|
||||||
if (piState != RdsPiBuffer::STATE_INVALID) {
|
if (piState != RdsPiBuffer::STATE_INVALID) {
|
||||||
DataPrint ("P");
|
DataPrint ("P");
|
||||||
DataPrint (String(((radio.rds.rdsA >> 8) >> 4) & 0xF, HEX) + String((radio.rds.rdsA >> 8) & 0xF, HEX));
|
String PIcodeToSend;
|
||||||
DataPrint (String(((radio.rds.rdsA) >> 4) & 0xF, HEX) + String((radio.rds.rdsA) & 0xF, HEX));
|
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) {
|
while (piState != 0) {
|
||||||
DataPrint("?");
|
DataPrint("?");
|
||||||
piState--;
|
piState--;
|
||||||
@@ -438,6 +440,7 @@ void readRds() {
|
|||||||
DataPrint ("\n");
|
DataPrint ("\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
XDRGTKRDS.toUpperCase();
|
||||||
DataPrint(XDRGTKRDS);
|
DataPrint(XDRGTKRDS);
|
||||||
XDRGTKRDSold = XDRGTKRDS;
|
XDRGTKRDSold = XDRGTKRDS;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user