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

Added extra checks on parsing CT and PIN

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-11-02 21:10:31 +01:00
parent bb747bdbbd
commit 5ddca26d39
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TEF6686.cpp
+17 -13
View File
@@ -1084,10 +1084,12 @@ void TEF6686::readRDS(byte showrdserrors)
if (!rdsDerrorThreshold) { if (!rdsDerrorThreshold) {
if (rds.rdsD != 0) { // PIN decoder if (rds.rdsD != 0) { // PIN decoder
rds.hasPIN = true; if ((rds.rdsD & 0x3f) < 61 && ((rds.rdsD >> 6) & 0x1f) < 24) {
rds.pinMin = rds.rdsD & 0x3f; rds.hasPIN = true;
rds.pinHour = rds.rdsD >> 6 & 0x1f; rds.pinMin = rds.rdsD & 0x3f;
rds.pinDay = rds.rdsD >> 11 & 0x1f; rds.pinHour = rds.rdsD >> 6 & 0x1f;
rds.pinDay = rds.rdsD >> 11 & 0x1f;
}
} }
} }
} break; } break;
@@ -1228,17 +1230,19 @@ void TEF6686::readRDS(byte showrdserrors)
J = J - 1461 * Y / 4 + 31; J = J - 1461 * Y / 4 + 31;
M = 80 * (J + 0) / 2447; M = 80 * (J + 0) / 2447;
rds.day = J - 2447 * M / 80; if ((J - 2447 * M / 80) < 32) rds.day = J - 2447 * M / 80;
J = M / 11; J = M / 11;
rds.month = M + 2 - (12 * J); if ((M + 2 - (12 * J)) < 13) rds.month = M + 2 - (12 * J);
rds.year = 100 * (C - 49) + Y + J; if ((100 * (C - 49) + Y + J) > 2022) rds.year = 100 * (C - 49) + Y + J;
rds.hour = ((rds.rdsD >> 12) & 0x0f); if ((((rds.rdsD >> 12) & 0x0f)) < 25) {
rds.hour += ((rds.rdsC << 4) & 0x0010); rds.hour = ((rds.rdsD >> 12) & 0x0f);
rds.minute = (rds.rdsD >> 6) & 0x3f; rds.hour += ((rds.rdsC << 4) & 0x0010);
rds.offset = ((bitRead(rds.rdsD, 5) ? -rds.rdsD & 0x3f : rds.rdsD & 0x3f) / 2); rds.offset = ((bitRead(rds.rdsD, 5) ? -rds.rdsD & 0x3f : rds.rdsD & 0x3f) / 2);
rds.hour += rds.offset; rds.hour += rds.offset;
rds.hour = (((byte)rds.hour + 24) % 24); rds.hour = (((byte)rds.hour + 24) % 24);
}
if (((rds.rdsD >> 6) & 0x3f) < 60) rds.minute = (rds.rdsD >> 6) & 0x3f;
rds.hasCT = true; rds.hasCT = true;
} }
} break; } break;