From f0f315238a39fb12e070bdaba95acf02a2b08c81 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Thu, 2 May 2024 20:44:28 +0200 Subject: [PATCH 1/3] Fixed a bug in ECC detection --- src/TEF6686.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp index 52320f2..675a94a 100644 --- a/src/TEF6686.cpp +++ b/src/TEF6686.cpp @@ -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 & 0x1C00) == 0 && rdsblock == RDS_GROUP_1A) { // ECC code readout rds.ECC = rds.rdsC & 0xff; rds.hasECC = true; From fae020164a0898e45d207fbe90db88d4e1a86d79 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Thu, 2 May 2024 20:49:11 +0200 Subject: [PATCH 2/3] Versioning --- src/language.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/language.h b/src/language.h index f75a620..1e062e1 100644 --- a/src/language.h +++ b/src/language.h @@ -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 From 56176d096763cae20e59e8a40a3999be2d8d03b0 Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Thu, 2 May 2024 21:27:16 +0200 Subject: [PATCH 3/3] Fixed bug in LIC detection --- src/TEF6686.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp index 675a94a..1327463 100644 --- a/src/TEF6686.cpp +++ b/src/TEF6686.cpp @@ -802,7 +802,7 @@ void TEF6686::readRDS(byte showrdserrors) { case RDS_GROUP_1A: case RDS_GROUP_1B: { if (!rdsCerrorThreshold) { - if ((rds.rdsC & 0x1C00) == 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; @@ -1116,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 = "";