Only emit network messages once we have seen two of them

(except in --net-verbatim mode, where we emit them all)

Move aircraft tracking into track.[ch].

Clean up references to "interactive mode" when tracking
aircraft - we always track aircraft, even in non-interactive
mode.
This commit is contained in:
Oliver Jowett 2015-02-08 14:27:03 +00:00
parent 704d8aaffb
commit 899c51ce85
10 changed files with 738 additions and 529 deletions

View file

@ -117,7 +117,6 @@ void modesInitConfig(void) {
Modes.net_http_port = MODES_NET_HTTP_PORT;
Modes.net_fatsv_port = MODES_NET_OUTPUT_FA_TSV_PORT;
Modes.interactive_rows = getTermRows();
Modes.interactive_delete_ttl = MODES_INTERACTIVE_DELETE_TTL;
Modes.interactive_display_ttl = MODES_INTERACTIVE_DISPLAY_TTL;
Modes.json_interval = 1;
Modes.json_location_accuracy = 1;
@ -645,15 +644,12 @@ void backgroundTasks(void) {
time_t now = time(NULL);
icaoFilterExpire();
trackPeriodicUpdate();
if (Modes.net) {
modesNetPeriodicWork();
}
// If Modes.aircrafts is not NULL, remove any stale aircraft
if (Modes.aircrafts) {
interactiveRemoveStaleAircrafts();
}
// Refresh screen when in interactive mode
if (Modes.interactive) {