Merge branch 'main' into New_Model_DP_666

This commit is contained in:
Leon
2024-05-04 22:43:53 +08:00
2 changed files with 3 additions and 15 deletions

View File

@@ -649,18 +649,6 @@ void TEF6686::readRDS(byte showrdserrors) {
}
if (afinit) {
/* Debug info
if ((rds.rdsC >> 8) > 224 && (rds.rdsC >> 8) < 250) {
Serial.print("#");
Serial.print((rds.rdsC >> 8) - 224);
Serial.print("\t");
Serial.println((rds.rdsC & 0xFF) * 10 + 8750);
} else {
Serial.print((rds.rdsC >> 8) * 10 + 8750);
Serial.print("\t");
Serial.println((rds.rdsC & 0xFF) * 10 + 8750);
}
*/
if ((rds.rdsC >> 8) > 224 && (rds.rdsC >> 8) < 250 && ((rds.rdsC & 0xFF) * 10 + 8750) == currentfreq && rds.hasAF) {
if (afmethodBtrigger) afmethodB = true; // Check for AF method B
afmethodBprobe = true;
@@ -814,7 +802,7 @@ void TEF6686::readRDS(byte showrdserrors) {
case RDS_GROUP_1A:
case RDS_GROUP_1B: {
if (!rdsCerrorThreshold) {
if (rds.rdsC >> 12 == 0 && rdsblock == RDS_GROUP_1A) { // ECC code readout
if (((rds.rdsC >> 12) & 0x07) == 0 && rdsblock == RDS_GROUP_1A) { // ECC code readout
rds.ECC = rds.rdsC & 0xff;
rds.hasECC = true;
@@ -1128,7 +1116,7 @@ void TEF6686::readRDS(byte showrdserrors) {
}
}
if (rds.rdsC >> 12 == 3 && rdsblock == RDS_GROUP_1A) { // LIC code readout
if (((rds.rdsC >> 12) & 0x07) == 3 && rdsblock == RDS_GROUP_1A) { // LIC code readout
rds.LIC = rds.rdsC & 0xff;
rds.hasLIC = true;
if (rds.LIC > 0 && rds.LIC < 128) rds.LICtext = LICtext[rds.LIC]; else rds.LICtext = "";

View File

@@ -1,7 +1,7 @@
#ifndef LANGUAGE_H
#define LANGUAGE_H
#define VERSION "v2.00.15"
#define VERSION "v2.00.16"
// [number of languages][number of texts]
// *** means the text is the same as in English