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

Tweak CPR rules for mlat messages, add some debug.

Browse source
This commit is contained in:
Oliver Jowett 2015-06-29 12:43:58 +01:00
parent f6ff1c853b
commit 98a55c8dec
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
track.c
View file

@ -239,7 +239,21 @@ static int doGlobalCPR(struct aircraft *a, struct modesMessage *mm, uint64_t now
lat, lon); lat, lon);
} }
if (result < 0) if (result < 0) {
#ifdef DEBUG_CPR_CHECKS
if (mm->bFlags & MODES_ACFLAGS_FROM_MLAT) {
fprintf(stderr, "CPR: decode failure from MLAT (%06X) (%d).\n", a->addr, result);
fprintf(stderr, " even: %d %d odd: %d %d fflag: %s\n",
a->even_cprlat, a->even_cprlon,
a->odd_cprlat, a->odd_cprlon,
fflag ? "odd" : "even");
}
#endif
return result;
}
// for mlat results, accept it unquestioningly
if (mm->bFlags & MODES_ACFLAGS_FROM_MLAT)
return result; return result;
// check max range // check max range
@ -375,6 +389,11 @@ static void updatePosition(struct aircraft *a, struct modesMessage *mm, uint64_t
location_result = doGlobalCPR(a, mm, now, &new_lat, &new_lon, &new_nuc); location_result = doGlobalCPR(a, mm, now, &new_lat, &new_lon, &new_nuc);
if (location_result == -2) { if (location_result == -2) {
#ifdef DEBUG_CPR_CHECKS
if (mm->bFlags & MODES_ACFLAGS_FROM_MLAT) {
fprintf(stderr, "CPR failure from MLAT (%06X).\n", a->addr);
}
#endif
// Global CPR failed because the position produced implausible results. // Global CPR failed because the position produced implausible results.
// This is bad data. Discard both odd and even messages and wait for a fresh pair. // This is bad data. Discard both odd and even messages and wait for a fresh pair.
// Also disable aircraft-relative positions until we have a new good position (but don't discard the // Also disable aircraft-relative positions until we have a new good position (but don't discard the
@ -394,6 +413,11 @@ static void updatePosition(struct aircraft *a, struct modesMessage *mm, uint64_t
MODES_ACFLAGS_AOG); MODES_ACFLAGS_AOG);
return; return;
} else if (location_result == -1) { } else if (location_result == -1) {
#ifdef DEBUG_CPR_CHECKS
if (mm->bFlags & MODES_ACFLAGS_FROM_MLAT) {
fprintf(stderr, "CPR skipped from MLAT (%06X).\n", a->addr);
}
#endif
// No local reference for surface position available, or the two messages crossed a zone. // No local reference for surface position available, or the two messages crossed a zone.
// Nonfatal, try again later. // Nonfatal, try again later.
Modes.stats_current.cpr_global_skipped++; Modes.stats_current.cpr_global_skipped++;