AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Just bail out of comm-b decoding early on really bad data, don't bother with a big negative score.

Browse source 
No change to test results.
This commit is contained in:
Oliver Jowett 2019-05-02 18:03:40 +08:00
parent d5741bf8c8
commit f968fea390
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
comm_b.c
View file

@ -301,7 +301,7 @@ static int decodeBDS40(struct modesMessage *mm, bool store)
} else if (!mcp_valid && mcp_raw == 0) { } else if (!mcp_valid && mcp_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 130; return 0;
} }
unsigned fms_alt = 0; unsigned fms_alt = 0;
@ -316,7 +316,7 @@ static int decodeBDS40(struct modesMessage *mm, bool store)
} else if (!fms_valid && fms_raw == 0) { } else if (!fms_valid && fms_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 130; return 0;
} }
float baro_setting = 0; float baro_setting = 0;
@ -331,11 +331,11 @@ static int decodeBDS40(struct modesMessage *mm, bool store)
} else if (!baro_valid && baro_raw == 0) { } else if (!baro_valid && baro_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 130; return 0;
} }
if (reserved_1 != 0) { if (reserved_1 != 0) {
score -= 80; return 0;
} }
if (mode_valid) { if (mode_valid) {
@ -343,11 +343,11 @@ static int decodeBDS40(struct modesMessage *mm, bool store)
} else if (!mode_valid && mode_raw == 0) { } else if (!mode_valid && mode_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 40; return 0;
} }
if (reserved_2 != 0) { if (reserved_2 != 0) {
score -= 20; return 0;
} }
if (source_valid) { if (source_valid) {
@ -355,7 +355,7 @@ static int decodeBDS40(struct modesMessage *mm, bool store)
} else if (!source_valid && source_raw == 0) { } else if (!source_valid && source_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 30; return 0;
} }
// small bonuses for consistent data // small bonuses for consistent data
@ -480,7 +480,7 @@ static int decodeBDS50(struct modesMessage *mm, bool store)
} else if (!roll_valid && roll_raw == 0 && !roll_sign) { } else if (!roll_valid && roll_raw == 0 && !roll_sign) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
float track = 0; float track = 0;
@ -493,7 +493,7 @@ static int decodeBDS50(struct modesMessage *mm, bool store)
} else if (!track_valid && track_raw == 0 && !track_sign) { } else if (!track_valid && track_raw == 0 && !track_sign) {
score += 1; score += 1;
} else { } else {
score -= 120; return 0;
} }
unsigned gs = 0; unsigned gs = 0;
@ -508,7 +508,7 @@ static int decodeBDS50(struct modesMessage *mm, bool store)
} else if (!gs_valid && gs_raw == 0) { } else if (!gs_valid && gs_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
float track_rate = 0; float track_rate = 0;
@ -526,7 +526,7 @@ static int decodeBDS50(struct modesMessage *mm, bool store)
} else if (!track_rate_valid && track_rate_raw == 0 && !track_rate_sign) { } else if (!track_rate_valid && track_rate_raw == 0 && !track_rate_sign) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
unsigned tas = 0; unsigned tas = 0;
@ -541,7 +541,7 @@ static int decodeBDS50(struct modesMessage *mm, bool store)
} else if (!tas_valid && tas_raw == 0) { } else if (!tas_valid && tas_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
// small bonuses for consistent data // small bonuses for consistent data
@ -637,7 +637,7 @@ static int decodeBDS60(struct modesMessage *mm, bool store)
} else if (!heading_valid && heading_raw == 0 && !heading_sign) { } else if (!heading_valid && heading_raw == 0 && !heading_sign) {
score += 1; score += 1;
} else { } else {
score -= 120; return 0;
} }
unsigned ias = 0; unsigned ias = 0;
@ -651,7 +651,7 @@ static int decodeBDS60(struct modesMessage *mm, bool store)
} else if (!ias_valid && ias_raw == 0) { } else if (!ias_valid && ias_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
float mach = 0; float mach = 0;
@ -665,7 +665,7 @@ static int decodeBDS60(struct modesMessage *mm, bool store)
} else if (!mach_valid && mach_raw == 0) { } else if (!mach_valid && mach_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
int baro_rate = 0; int baro_rate = 0;
@ -683,7 +683,7 @@ static int decodeBDS60(struct modesMessage *mm, bool store)
} else if (!baro_rate_valid && baro_rate_raw == 0) { } else if (!baro_rate_valid && baro_rate_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
int inertial_rate = 0; int inertial_rate = 0;
@ -701,7 +701,7 @@ static int decodeBDS60(struct modesMessage *mm, bool store)
} else if (!inertial_rate_valid && inertial_rate_raw == 0) { } else if (!inertial_rate_valid && inertial_rate_raw == 0) {
score += 1; score += 1;
} else { } else {
score -= 110; return 0;
} }
// small bonuses for consistent data // small bonuses for consistent data