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

Interactive list aircraft display and delete changes

Browse source 
Create two different Time-To-Live parameters for the interactive display
list.

1) Modes.interactive_display_ttl defines for how long the display of an
aircraft persists after the last received message. The default is
MODES_INTERACTIVE_DISPLAY_TTL, which is set to 60 seconds. This replaces
the previous Modes.interactive_ttl/MODES_INTERACTIVE_TTL settings (which
were also 60 seconds)

2) Add an additional Modes.interactive_delete_ttl  parameter, and
default it to  MODES_INTERACTIVE_DELETE_TTL, shich is set to 300
seconds/5 minutes. This defines for how long an aircraft persists in the
list structure after the last received message before being deleted.

Also tidy up a few comments.
This commit is contained in:
Malcolm Robb 2013-08-19 15:55:17 +01:00
parent da8151dd70
commit 1ebdd6d7a7
2 changed files with 279 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

409
dump1090.c
View file

@ -1,37 +1,37 @@
/* dump1090, a Mode S messages decoder for RTLSDR devices. // dump1090, a Mode S messages decoder for RTLSDR devices.
* //
* Copyright (C) 2012 by Salvatore Sanfilippo <antirez@gmail.com> // Copyright (C) 2012 by Salvatore Sanfilippo <antirez@gmail.com>
* //
* All rights reserved. // All rights reserved.
* //
* Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
* met: // met:
* //
* * Redistributions of source code must retain the above copyright // * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. // notice, this list of conditions and the following disclaimer.
* //
* * Redistributions in binary form must reproduce the above copyright // * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the // notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. // documentation and/or other materials provided with the distribution.
* //
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, // HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ //
#include "dump1090.h" #include "dump1090.h"
//
/* ============================= Utility functions ========================== */ // ============================= Utility functions ==========================
//
static uint64_t mstime(void) { static uint64_t mstime(void) {
struct timeval tv; struct timeval tv;
uint64_t mst; uint64_t mst;
@ -47,27 +47,28 @@ void sigintHandler(int dummy) {
signal(SIGINT, SIG_DFL); // reset signal handler - bit extra safety signal(SIGINT, SIG_DFL); // reset signal handler - bit extra safety
Modes.exit = 1; // Signal to threads that we are done Modes.exit = 1; // Signal to threads that we are done
} }
//
/* =============================== Initialization =========================== */ // =============================== Initialization ===========================
//
void modesInitConfig(void) { void modesInitConfig(void) {
// Default everything to zero/NULL // Default everything to zero/NULL
memset(&Modes, 0, sizeof(Modes)); memset(&Modes, 0, sizeof(Modes));
// Now initialise things that should not be 0/NULL to their defaults // Now initialise things that should not be 0/NULL to their defaults
Modes.gain = MODES_MAX_GAIN; Modes.gain = MODES_MAX_GAIN;
Modes.freq = MODES_DEFAULT_FREQ; Modes.freq = MODES_DEFAULT_FREQ;
Modes.check_crc = 1; Modes.check_crc = 1;
Modes.net_output_sbs_port = MODES_NET_OUTPUT_SBS_PORT; Modes.net_output_sbs_port = MODES_NET_OUTPUT_SBS_PORT;
Modes.net_output_raw_port = MODES_NET_OUTPUT_RAW_PORT; Modes.net_output_raw_port = MODES_NET_OUTPUT_RAW_PORT;
Modes.net_input_raw_port = MODES_NET_INPUT_RAW_PORT; Modes.net_input_raw_port = MODES_NET_INPUT_RAW_PORT;
Modes.net_output_beast_port = MODES_NET_OUTPUT_BEAST_PORT; Modes.net_output_beast_port = MODES_NET_OUTPUT_BEAST_PORT;
Modes.net_input_beast_port = MODES_NET_INPUT_BEAST_PORT; Modes.net_input_beast_port = MODES_NET_INPUT_BEAST_PORT;
Modes.net_http_port = MODES_NET_HTTP_PORT; Modes.net_http_port = MODES_NET_HTTP_PORT;
Modes.interactive_rows = MODES_INTERACTIVE_ROWS; Modes.interactive_rows = MODES_INTERACTIVE_ROWS;
Modes.interactive_ttl = MODES_INTERACTIVE_TTL; Modes.interactive_delete_ttl = MODES_INTERACTIVE_DELETE_TTL;
Modes.fUserLat = MODES_USER_LATITUDE_DFLT; Modes.interactive_display_ttl = MODES_INTERACTIVE_DISPLAY_TTL;
Modes.fUserLon = MODES_USER_LONGITUDE_DFLT; Modes.fUserLat = MODES_USER_LATITUDE_DFLT;
Modes.fUserLon = MODES_USER_LONGITUDE_DFLT;
} }
void modesInit(void) { void modesInit(void) {
@ -302,7 +303,11 @@ void *readerThreadEntryPoint(void *arg) {
Modes.data_ready = 1; Modes.data_ready = 1;
pthread_cond_signal(&Modes.data_cond); pthread_cond_signal(&Modes.data_cond);
pthread_mutex_unlock(&Modes.data_mutex); pthread_mutex_unlock(&Modes.data_mutex);
#ifndef _WIN32
pthread_exit(NULL); pthread_exit(NULL);
#else
return NULL;
#endif
} }
/* ============================== Debugging ================================= */ /* ============================== Debugging ================================= */
@ -426,9 +431,9 @@ void dumpRawMessage(char *descr, unsigned char *msg,
dumpMagnitudeVector(m,offset); dumpMagnitudeVector(m,offset);
printf("---\n\n"); printf("---\n\n");
} }
//
/* ===================== Mode A/C detection and decoding =================== */ // ===================== Mode A/C detection and decoding ===================
//
// //
// This table is used to build the Mode A/C variable called ModeABits.Each // This table is used to build the Mode A/C variable called ModeABits.Each
// bit period is inspected, and if it's value exceeds the threshold limit, // bit period is inspected, and if it's value exceeds the threshold limit,
@ -2370,8 +2375,8 @@ void useModesMessage(struct modesMessage *mm) {
if (Modes.stat_raw_connections) {modesSendRawOutput(mm);} if (Modes.stat_raw_connections) {modesSendRawOutput(mm);}
} }
} }
//
/* ========================= Interactive mode =============================== */ // ========================= Interactive mode ===============================
// //
// Return a new aircraft structure for the interactive mode linked list // Return a new aircraft structure for the interactive mode linked list
// of aircraft // of aircraft
@ -2404,6 +2409,8 @@ struct aircraft *interactiveCreateAircraft(struct modesMessage *mm) {
return (a); return (a);
} }
// //
//=========================================================================
//
// Return the aircraft with the specified address, or NULL if no aircraft // Return the aircraft with the specified address, or NULL if no aircraft
// exists with this address. // exists with this address.
// //
@ -2417,6 +2424,8 @@ struct aircraft *interactiveFindAircraft(uint32_t addr) {
return (NULL); return (NULL);
} }
// //
//=========================================================================
//
// We have received a Mode A or C response. // We have received a Mode A or C response.
// //
// Search through the list of known Mode-S aircraft and tag them if this Mode A/C // Search through the list of known Mode-S aircraft and tag them if this Mode A/C
@ -2477,7 +2486,9 @@ void interactiveUpdateAircraftModeA(struct aircraft *a) {
b = b->next; b = b->next;
} }
} }
//
//=========================================================================
//
void interactiveUpdateAircraftModeS() { void interactiveUpdateAircraftModeS() {
struct aircraft *a = Modes.aircrafts; struct aircraft *a = Modes.aircrafts;
@ -2493,17 +2504,22 @@ void interactiveUpdateAircraftModeS() {
a = a->next; a = a->next;
} }
} }
//
/* Always positive MOD operation, used for CPR decoding. */ //=========================================================================
//
// Always positive MOD operation, used for CPR decoding.
int cprModFunction(int a, int b) { int cprModFunction(int a, int b) {
int res = a % b; int res = a % b;
if (res < 0) res += b; if (res < 0) res += b;
return res; return res;
} }
//
/* The NL function uses the precomputed table from 1090-WP-9-14 */ //=========================================================================
//
// The NL function uses the precomputed table from 1090-WP-9-14
//
int cprNLFunction(double lat) { int cprNLFunction(double lat) {
if (lat < 0) lat = -lat; /* Table is simmetric about the equator. */ if (lat < 0) lat = -lat; // Table is simmetric about the equator
if (lat < 10.47047130) return 59; if (lat < 10.47047130) return 59;
if (lat < 14.82817437) return 58; if (lat < 14.82817437) return 58;
if (lat < 18.18626357) return 57; if (lat < 18.18626357) return 57;
@ -2564,26 +2580,32 @@ int cprNLFunction(double lat) {
if (lat < 87.00000000) return 2; if (lat < 87.00000000) return 2;
else return 1; else return 1;
} }
//
//=========================================================================
//
int cprNFunction(double lat, int fflag) { int cprNFunction(double lat, int fflag) {
int nl = cprNLFunction(lat) - (fflag ? 1 : 0); int nl = cprNLFunction(lat) - (fflag ? 1 : 0);
if (nl < 1) nl = 1; if (nl < 1) nl = 1;
return nl; return nl;
} }
//
//=========================================================================
//
double cprDlonFunction(double lat, int fflag, int surface) { double cprDlonFunction(double lat, int fflag, int surface) {
return (surface ? 90.0 : 360.0) / cprNFunction(lat, fflag); return (surface ? 90.0 : 360.0) / cprNFunction(lat, fflag);
} }
//
/* This algorithm comes from: //=========================================================================
* http://www.lll.lu/~edward/edward/adsb/DecodingADSBposition.html. //
* // This algorithm comes from:
* A few remarks: // http://www.lll.lu/~edward/edward/adsb/DecodingADSBposition.html.
* 1) 131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits. //
* 2) We assume that we always received the odd packet as last packet for // A few remarks:
* simplicity. This may provide a position that is less fresh of a few // 1) 131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
* seconds. // 2) We assume that we always received the odd packet as last packet for
*/ // simplicity. This may provide a position that is less fresh of a few
// seconds.
//
void decodeCPR(struct aircraft *a, int fflag, int surface) { void decodeCPR(struct aircraft *a, int fflag, int surface) {
double AirDlat0 = (surface ? 90.0 : 360.0) / 60.0; double AirDlat0 = (surface ? 90.0 : 360.0) / 60.0;
double AirDlat1 = (surface ? 90.0 : 360.0) / 59.0; double AirDlat1 = (surface ? 90.0 : 360.0) / 59.0;
@ -2636,17 +2658,19 @@ void decodeCPR(struct aircraft *a, int fflag, int surface) {
a->timestampLatLon = a->timestamp; a->timestampLatLon = a->timestamp;
a->bFlags |= (MODES_ACFLAGS_LATLON_VALID | MODES_ACFLAGS_LATLON_REL_OK); a->bFlags |= (MODES_ACFLAGS_LATLON_VALID | MODES_ACFLAGS_LATLON_REL_OK);
} }
//
/* This algorithm comes from: //=========================================================================
* 1090-WP29-07-Draft_CPR101 (which also defines decodeCPR() ) //
* // This algorithm comes from:
* There is an error in this document related to CPR relative decode. // 1090-WP29-07-Draft_CPR101 (which also defines decodeCPR() )
* Should use trunc() rather than the floor() function in Eq 38 and related for deltaZI. //
* floor() returns integer less than argument // There is an error in this document related to CPR relative decode.
* trunc() returns integer closer to zero than argument. // Should use trunc() rather than the floor() function in Eq 38 and related for deltaZI.
* Note: text of document describes trunc() functionality for deltaZI calculation // floor() returns integer less than argument
* but the formulae use floor(). // trunc() returns integer closer to zero than argument.
*/ // Note: text of document describes trunc() functionality for deltaZI calculation
// but the formulae use floor().
//
int decodeCPRrelative(struct aircraft *a, int fflag, int surface) { int decodeCPRrelative(struct aircraft *a, int fflag, int surface) {
double AirDlat; double AirDlat;
double AirDlon; double AirDlon;
@ -2709,8 +2733,11 @@ int decodeCPRrelative(struct aircraft *a, int fflag, int surface) {
a->bFlags |= (MODES_ACFLAGS_LATLON_VALID | MODES_ACFLAGS_LATLON_REL_OK); a->bFlags |= (MODES_ACFLAGS_LATLON_VALID | MODES_ACFLAGS_LATLON_REL_OK);
return (0); return (0);
} }
//
/* Receive new messages and populate the interactive mode with more info. */ //=========================================================================
//
// Receive new messages and populate the interactive mode with more info
//
struct aircraft *interactiveReceiveData(struct modesMessage *mm) { struct aircraft *interactiveReceiveData(struct modesMessage *mm) {
struct aircraft *a, *aux; struct aircraft *a, *aux;
@ -2718,7 +2745,7 @@ struct aircraft *interactiveReceiveData(struct modesMessage *mm) {
if (Modes.check_crc && (mm->crcok == 0) && (mm->correctedbits == 0)) if (Modes.check_crc && (mm->crcok == 0) && (mm->correctedbits == 0))
return NULL; return NULL;
// Loookup our aircraft or create a new one // Lookup our aircraft or create a new one
a = interactiveFindAircraft(mm->addr); a = interactiveFindAircraft(mm->addr);
if (!a) { // If it's a currently unknown aircraft.... if (!a) { // If it's a currently unknown aircraft....
a = interactiveCreateAircraft(mm); // ., create a new record for it, a = interactiveCreateAircraft(mm); // ., create a new record for it,
@ -2850,8 +2877,11 @@ struct aircraft *interactiveReceiveData(struct modesMessage *mm) {
return (a); return (a);
} }
//
/* Show the currently captured interactive data on screen. */ //=========================================================================
//
// Show the currently captured interactive data on screen.
//
void interactiveShowData(void) { void interactiveShowData(void) {
struct aircraft *a = Modes.aircrafts; struct aircraft *a = Modes.aircrafts;
time_t now = time(NULL); time_t now = time(NULL);
@ -2859,10 +2889,25 @@ void interactiveShowData(void) {
char progress; char progress;
char spinner[4] = "|/-\\"; char spinner[4] = "|/-\\";
// Refresh screen every (MODES_INTERACTIVE_REFRESH_TIME) miliseconde
if ((mstime() - Modes.interactive_last_update) < MODES_INTERACTIVE_REFRESH_TIME)
{return;}
Modes.interactive_last_update = mstime();
// Attempt to reconsile any ModeA/C with known Mode-S
// We can't condition on Modes.modeac because ModeA/C could be comming
// in from a raw input port which we can't turn off.
interactiveUpdateAircraftModeS();
progress = spinner[time(NULL)%4]; progress = spinner[time(NULL)%4];
printf("\x1b[H\x1b[2J"); /* Clear the screen */ #ifndef _WIN32
printf("\x1b[H\x1b[2J"); // Clear the screen
#else
system("cls");
#endif
if (Modes.interactive_rtl1090 == 0) { if (Modes.interactive_rtl1090 == 0) {
printf ( printf (
"Hex Mode Sqwk Flight Alt Spd Hdg Lat Long Sig Msgs Ti%c\n", progress); "Hex Mode Sqwk Flight Alt Spd Hdg Lat Long Sig Msgs Ti%c\n", progress);
@ -2873,104 +2918,109 @@ void interactiveShowData(void) {
printf( printf(
"-------------------------------------------------------------------------------\n"); "-------------------------------------------------------------------------------\n");
while(a && count < Modes.interactive_rows) { while(a && (count < Modes.interactive_rows)) {
int msgs = a->messages;
int flags = a->modeACflags;
if ( (((flags & (MODEAC_MSG_FLAG )) == 0 ) ) if ((now - a->seen) < Modes.interactive_display_ttl)
|| (((flags & (MODEAC_MSG_MODES_HIT | MODEAC_MSG_MODEA_ONLY)) == MODEAC_MSG_MODEA_ONLY) && (msgs > 4 ) ) {
|| (((flags & (MODEAC_MSG_MODES_HIT | MODEAC_MSG_MODEC_OLD )) == 0 ) && (msgs > 127) ) int msgs = a->messages;
) { int flags = a->modeACflags;
int altitude = a->altitude, speed = a->speed;
char strSquawk[5] = " ";
char strFl[6] = " ";
char strTt[5] = " ";
char strGs[5] = " ";
// Convert units to metric if --metric was specified if ( (((flags & (MODEAC_MSG_FLAG )) == 0 ) )
if (Modes.metric) { || (((flags & (MODEAC_MSG_MODES_HIT | MODEAC_MSG_MODEA_ONLY)) == MODEAC_MSG_MODEA_ONLY) && (msgs > 4 ) )
altitude = (int) (altitude / 3.2828); || (((flags & (MODEAC_MSG_MODES_HIT | MODEAC_MSG_MODEC_OLD )) == 0 ) && (msgs > 127) )
speed = (int) (speed * 1.852); ) {
int altitude = a->altitude, speed = a->speed;
char strSquawk[5] = " ";
char strFl[6] = " ";
char strTt[5] = " ";
char strGs[5] = " ";
// Convert units to metric if --metric was specified
if (Modes.metric) {
altitude = (int) (altitude / 3.2828);
speed = (int) (speed * 1.852);
}
if (a->bFlags & MODES_ACFLAGS_SQUAWK_VALID) {
snprintf(strSquawk,5,"%04x", a->modeA);}
if (a->bFlags & MODES_ACFLAGS_SPEED_VALID) {
snprintf (strGs, 5,"%3d", speed);}
if (a->bFlags & MODES_ACFLAGS_HEADING_VALID) {
snprintf (strTt, 5,"%03d", a->track);}
if (msgs > 99999) {
msgs = 99999;}
if (Modes.interactive_rtl1090) { // RTL1090 display mode
if (a->bFlags & MODES_ACFLAGS_ALTITUDE_VALID) {
snprintf(strFl,6,"F%03d",(altitude/100));
}
printf("%06x %-8s %-4s %-3s %-3s %4s %-6d %-2d\n",
a->addr, a->flight, strFl, strGs, strTt, strSquawk, msgs, (int)(now - a->seen));
} else { // Dump1090 display mode
char strMode[5] = " ";
char strLat[8] = " ";
char strLon[9] = " ";
unsigned char * pSig = a->signalLevel;
unsigned int signalAverage = (pSig[0] + pSig[1] + pSig[2] + pSig[3] +
pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 3;
if ((flags & MODEAC_MSG_FLAG) == 0) {
strMode[0] = 'S';
} else if (flags & MODEAC_MSG_MODEA_ONLY) {
strMode[0] = 'A';
}
if (flags & MODEAC_MSG_MODEA_HIT) {strMode[2] = 'a';}
if (flags & MODEAC_MSG_MODEC_HIT) {strMode[3] = 'c';}
if (a->bFlags & MODES_ACFLAGS_LATLON_VALID) {
snprintf(strLat, 8,"%7.03f", a->lat);
snprintf(strLon, 9,"%8.03f", a->lon);
}
if (a->bFlags & MODES_ACFLAGS_AOG) {
snprintf(strFl, 6," grnd");
} else if (a->bFlags & MODES_ACFLAGS_ALTITUDE_VALID) {
snprintf(strFl, 6, "%5d", altitude);
}
printf("%06x %-4s %-4s %-8s %5s %3s %3s %7s %8s %3d %5d %2d\n",
a->addr, strMode, strSquawk, a->flight, strFl, strGs, strTt,
strLat, strLon, signalAverage, msgs, (int)(now - a->seen));
}
count++;
} }
}
if (a->bFlags & MODES_ACFLAGS_SQUAWK_VALID) {
snprintf(strSquawk,5,"%04x", a->modeA);}
if (a->bFlags & MODES_ACFLAGS_SPEED_VALID) {
snprintf (strGs, 5,"%3d", speed);}
if (a->bFlags & MODES_ACFLAGS_HEADING_VALID) {
snprintf (strTt, 5,"%03d", a->track);}
if (msgs > 99999) {
msgs = 99999;}
if (Modes.interactive_rtl1090) { // RTL1090 display mode
if (a->bFlags & MODES_ACFLAGS_ALTITUDE_VALID) {
snprintf(strFl,6,"F%03d",(altitude/100));
}
printf("%06x %-8s %-4s %-3s %-3s %4s %-6d %-2d\n",
a->addr, a->flight, strFl, strGs, strTt, strSquawk, msgs, (int)(now - a->seen));
} else { // Dump1090 display mode
char strMode[5] = " ";
char strLat[8] = " ";
char strLon[9] = " ";
unsigned char * pSig = a->signalLevel;
unsigned int signalAverage = (pSig[0] + pSig[1] + pSig[2] + pSig[3] +
pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 3;
if ((flags & MODEAC_MSG_FLAG) == 0) {
strMode[0] = 'S';
} else if (flags & MODEAC_MSG_MODEA_ONLY) {
strMode[0] = 'A';
}
if (flags & MODEAC_MSG_MODEA_HIT) {strMode[2] = 'a';}
if (flags & MODEAC_MSG_MODEC_HIT) {strMode[3] = 'c';}
if (a->bFlags & MODES_ACFLAGS_LATLON_VALID) {
snprintf(strLat, 8,"%7.03f", a->lat);
snprintf(strLon, 9,"%8.03f", a->lon);
}
if (a->bFlags & MODES_ACFLAGS_AOG) {
snprintf(strFl, 6," grnd");
} else if (a->bFlags & MODES_ACFLAGS_ALTITUDE_VALID) {
snprintf(strFl, 6, "%5d", altitude);
}
// printf("%06x %-4s %-4s %-8s %5d %3d %3d %7.03f %8.03f %3d %5d %2d\n",
// a->addr, strMode, strSquawk, a->flight, altitude, speed, a->track,
// a->lat, a->lon, signalAverage, msgs, (int)(now - a->seen));
printf("%06x %-4s %-4s %-8s %5s %3s %3s %7s %8s %3d %5d %2d\n",
a->addr, strMode, strSquawk, a->flight, strFl, strGs, strTt,
strLat, strLon, signalAverage, msgs, (int)(now - a->seen));
}
count++;
}
a = a->next; a = a->next;
} }
} }
//
/* When in interactive mode If we don't receive new nessages within //=========================================================================
* MODES_INTERACTIVE_TTL seconds we remove the aircraft from the list. */ //
// When in interactive mode If we don't receive new nessages within
// MODES_INTERACTIVE__DELETE_TTL seconds we remove the aircraft from the list.
//
void interactiveRemoveStaleAircrafts(void) { void interactiveRemoveStaleAircrafts(void) {
struct aircraft *a = Modes.aircrafts; struct aircraft *a = Modes.aircrafts;
struct aircraft *prev = NULL; struct aircraft *prev = NULL;
time_t now = time(NULL); time_t now = time(NULL);
while(a) { while(a) {
if ((now - a->seen) > Modes.interactive_ttl) { if ((now - a->seen) > Modes.interactive_delete_ttl) {
struct aircraft *next = a->next; struct aircraft *next = a->next;
/* Remove the element from the linked list, with care // Remove the element from the linked list, with care
* if we are removing the first element. */ // if we are removing the first element
free(a);
if (!prev) if (!prev)
Modes.aircrafts = next; Modes.aircrafts = next;
else else
prev->next = next; prev->next = next;
free(a);
a = next; a = next;
} else { } else {
prev = a; prev = a;
@ -3850,22 +3900,13 @@ void backgroundTasks(void) {
} }
// If Modes.aircrafts is not NULL, remove any stale aircraft // If Modes.aircrafts is not NULL, remove any stale aircraft
if (Modes.aircrafts) if (Modes.aircrafts) {
{interactiveRemoveStaleAircrafts();} interactiveRemoveStaleAircrafts();
}
// Refresh screen when in interactive mode // Refresh screen when in interactive mode
if ((Modes.interactive) && if (Modes.interactive) {
((mstime() - Modes.interactive_last_update) > MODES_INTERACTIVE_REFRESH_TIME) ) {
// Attempt to reconsile any ModeA/C with known Mode-S
// We can't condition on Modes.modeac because ModeA/C could be comming
// in from a raw input port which we can't turn off.
interactiveUpdateAircraftModeS();
// Now display Mode-S and any non-reconsiled Modes-A/C
interactiveShowData(); interactiveShowData();
Modes.interactive_last_update = mstime();
} }
} }
@ -3939,7 +3980,7 @@ int main(int argc, char **argv) {
} else if (!strcmp(argv[j],"--interactive-rows") && more) { } else if (!strcmp(argv[j],"--interactive-rows") && more) {
Modes.interactive_rows = atoi(argv[++j]); Modes.interactive_rows = atoi(argv[++j]);
} else if (!strcmp(argv[j],"--interactive-ttl") && more) { } else if (!strcmp(argv[j],"--interactive-ttl") && more) {
Modes.interactive_ttl = atoi(argv[++j]); Modes.interactive_display_ttl = atoi(argv[++j]);
} else if (!strcmp(argv[j],"--lat") && more) { } else if (!strcmp(argv[j],"--lat") && more) {
Modes.fUserLat = atof(argv[++j]); Modes.fUserLat = atof(argv[++j]);
} else if (!strcmp(argv[j],"--lon") && more) { } else if (!strcmp(argv[j],"--lon") && more) {

92
dump1090.h
View file

@ -1,32 +1,32 @@
/* dump1090, a Mode S messages decoder for RTLSDR devices. // dump1090, a Mode S messages decoder for RTLSDR devices.
* //
* Copyright (C) 2012 by Salvatore Sanfilippo <antirez@gmail.com> // Copyright (C) 2012 by Salvatore Sanfilippo <antirez@gmail.com>
* //
* All rights reserved. // All rights reserved.
* //
* Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
* met: // met:
* //
* * Redistributions of source code must retain the above copyright // * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. // notice, this list of conditions and the following disclaimer.
* //
* * Redistributions in binary form must reproduce the above copyright // * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the // notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. // documentation and/or other materials provided with the distribution.
* //
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, // HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ //
#ifndef __DUMP1090_H #ifndef __DUMP1090_H
#define __DUMP1090_H #define __DUMP1090_H
@ -37,9 +37,9 @@
// MinorVer changes when additional features are added, but not for bug fixes (range 00-99) // MinorVer changes when additional features are added, but not for bug fixes (range 00-99)
// DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update
// //
#define MODES_DUMP1090_VERSION "1.07.2305.13" #define MODES_DUMP1090_VERSION "1.07.1908.13"
/* ============================= Include files ========================== */ // ============================= Include files ==========================
#ifndef _WIN32 #ifndef _WIN32
#include <stdio.h> #include <stdio.h>
@ -63,7 +63,7 @@
#include "rtl-sdr.h" #include "rtl-sdr.h"
#endif #endif
/* ============================= #defines =============================== */ // ============================= #defines ===============================
#ifdef USER_LATITUDE #ifdef USER_LATITUDE
#define MODES_USER_LATITUDE_DFLT (USER_LATITUDE) #define MODES_USER_LATITUDE_DFLT (USER_LATITUDE)
@ -155,8 +155,9 @@
#define MODES_DEBUG_NOPREAMBLE_LEVEL 25 #define MODES_DEBUG_NOPREAMBLE_LEVEL 25
#define MODES_INTERACTIVE_REFRESH_TIME 250 // Milliseconds #define MODES_INTERACTIVE_REFRESH_TIME 250 // Milliseconds
#define MODES_INTERACTIVE_ROWS 15 // Rows on screen #define MODES_INTERACTIVE_ROWS 22 // Rows on screen
#define MODES_INTERACTIVE_TTL 60 // TTL before being removed #define MODES_INTERACTIVE_DELETE_TTL 300 // Delete from the list after 300 seconds
#define MODES_INTERACTIVE_DISPLAY_TTL 60 // Delete from display after 60 seconds
#define MODES_NET_MAX_FD 1024 #define MODES_NET_MAX_FD 1024
#define MODES_NET_INPUT_RAW_PORT 30001 #define MODES_NET_INPUT_RAW_PORT 30001
@ -174,7 +175,7 @@
#define MODES_NOTUSED(V) ((void) V) #define MODES_NOTUSED(V) ((void) V)
/* ======================== structure declarations ========================= */ //======================== structure declarations =========================
// Structure used to describe a networking client // Structure used to describe a networking client
struct client { struct client {
@ -278,7 +279,8 @@ struct { // Internal state
int quiet; // Suppress stdout int quiet; // Suppress stdout
int interactive; // Interactive mode int interactive; // Interactive mode
int interactive_rows; // Interactive mode: max number of rows int interactive_rows; // Interactive mode: max number of rows
int interactive_ttl; // Interactive mode: TTL before deletion int interactive_display_ttl; // Interactive mode: TTL display
int interactive_delete_ttl; // Interactive mode: TTL before deletion
int stats; // Print stats at exit in --ifile mode int stats; // Print stats at exit in --ifile mode
int onlyaddr; // Print only ICAO addresses int onlyaddr; // Print only ICAO addresses
int metric; // Use metric units int metric; // Use metric units
@ -373,24 +375,38 @@ struct modesMessage {
int bFlags; // Flags related to fields in this structure int bFlags; // Flags related to fields in this structure
}; };
/* ======================== function declarations ========================= */ // ======================== function declarations =========================
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
//
// Functions exported from mode_ac.c
//
int detectModeA (uint16_t *m, struct modesMessage *mm); int detectModeA (uint16_t *m, struct modesMessage *mm);
void decodeModeAMessage(struct modesMessage *mm, int ModeA); void decodeModeAMessage(struct modesMessage *mm, int ModeA);
int ModeAToModeC (unsigned int ModeA); int ModeAToModeC (unsigned int ModeA);
void interactiveShowData(void); //
// Functions exported from interactive.c
//
struct aircraft* interactiveReceiveData(struct modesMessage *mm); struct aircraft* interactiveReceiveData(struct modesMessage *mm);
void interactiveShowData(void);
void interactiveRemoveStaleAircrafts(void);
//
// Functions exported from dump1090.c
//
void modesSendAllClients (int service, void *msg, int len); void modesSendAllClients (int service, void *msg, int len);
void modesSendRawOutput (struct modesMessage *mm); void modesSendRawOutput (struct modesMessage *mm);
void modesSendBeastOutput (struct modesMessage *mm); void modesSendBeastOutput (struct modesMessage *mm);
void modesSendSBSOutput (struct modesMessage *mm); void modesSendSBSOutput (struct modesMessage *mm);
void useModesMessage (struct modesMessage *mm); void useModesMessage (struct modesMessage *mm);
void decodeCPR (struct aircraft *a, int fflag, int surface);
int decodeCPRrelative(struct aircraft *a, int fflag, int surface);
int fixBitErrors (unsigned char *msg, int bits, int maxfix, char *fixedbits); int fixBitErrors (unsigned char *msg, int bits, int maxfix, char *fixedbits);
void modesInitErrorInfo (); void modesInitErrorInfo ();