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

Tweak when we allow updates to air/ground status.

Browse source
This commit is contained in:
Oliver Jowett 2018-01-09 14:47:08 +00:00
parent 571ea7ac41
commit 2ce2af1685
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
track.c
View file

@ -940,9 +940,16 @@ struct aircraft *trackUpdateFromMessage(struct modesMessage *mm)
a->geom_rate = mm->geom_rate; a->geom_rate = mm->geom_rate;
} }
if (mm->airground != AG_INVALID && accept_data(&a->airground_valid, mm->source)) { if (mm->airground != AG_INVALID) {
// If our current state is UNCERTAIN, accept new data as normal
// If our current state is certain but new data is not, only accept the uncertain state if the certain data has gone stale
if (mm->airground != AG_UNCERTAIN ||
(mm->airground == AG_UNCERTAIN && !trackDataFresh(&a->airground_valid))) {
if (accept_data(&a->airground_valid, mm->source)) {
a->airground = mm->airground; a->airground = mm->airground;
} }
}
}
if (mm->callsign_valid && accept_data(&a->callsign_valid, mm->source)) { if (mm->callsign_valid && accept_data(&a->callsign_valid, mm->source)) {
memcpy(a->callsign, mm->callsign, sizeof(a->callsign)); memcpy(a->callsign, mm->callsign, sizeof(a->callsign));

6
track.h
View file

@ -259,6 +259,12 @@ static inline int trackDataValid(const data_validity *v)
return (v->source != SOURCE_INVALID && messageNow() < v->expires); return (v->source != SOURCE_INVALID && messageNow() < v->expires);
} }
/* is this bit of data fresh? */
static inline int trackDataFresh(const data_validity *v)
{
return (v->source != SOURCE_INVALID && messageNow() < v->stale);
}
/* what's the age of this data, in milliseconds? */ /* what's the age of this data, in milliseconds? */
static inline uint64_t trackDataAge(const data_validity *v) static inline uint64_t trackDataAge(const data_validity *v)
{ {