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

Additional Timestamps for Lat Lon

Browse source 
1) Implement additional timestamps to remember when a new Lat/Lon value
is generated.

2) Increase callsign[] character array to 16 chars  to make it long word
aligned.

3) Change some more comments from /* to //
This commit is contained in:
Malcolm Robb 2013-05-07 21:52:54 +01:00
parent ed076d0d98
commit 71ace95fd4
1 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
dump1090.c
View file

@ -56,7 +56,7 @@
// 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.04.0205.13" #define MODES_DUMP1090_VERSION "1.04.0705.13"
#define MODES_DEFAULT_RATE 2000000 #define MODES_DEFAULT_RATE 2000000
#define MODES_DEFAULT_FREQ 1090000000 #define MODES_DEFAULT_FREQ 1090000000
@ -140,12 +140,15 @@ struct client {
// Structure used to describe an aircraft in iteractive mode // Structure used to describe an aircraft in iteractive mode
struct aircraft { struct aircraft {
uint32_t addr; // ICAO address uint32_t addr; // ICAO address
char flight[9]; // Flight number char flight[16]; // Flight number
unsigned char signalLevel[8]; // Last 8 Signal Amplitudes unsigned char signalLevel[8]; // Last 8 Signal Amplitudes
int altitude; // Altitude int altitude; // Altitude
int speed; // Velocity computed from EW and NS components int speed; // Velocity computed from EW and NS components
int track; // Angle of flight int track; // Angle of flight
time_t seen; // Time at which the last packet was received time_t seen; // Time at which the last packet was received
time_t seenLatLon; // Time at which the last lat long was calculated
uint64_t timestamp; // Timestamp at which the last packet was received
uint64_t timestampLatLon; // Timestamp at which the last lat long was calculated
long messages; // Number of Mode S messages received long messages; // Number of Mode S messages received
int modeA; // Squawk int modeA; // Squawk
int modeC; // Altitude int modeC; // Altitude
@ -247,50 +250,50 @@ struct {
unsigned int stat_ModeAC; unsigned int stat_ModeAC;
} Modes; } Modes;
/* The struct we use to store information about a decoded message. */ // The struct we use to store information about a decoded message.
struct modesMessage { struct modesMessage {
/* Generic fields */ // Generic fields
unsigned char msg[MODES_LONG_MSG_BYTES]; /* Binary message. */ unsigned char msg[MODES_LONG_MSG_BYTES]; // Binary message.
int msgbits; /* Number of bits in message */ int msgbits; // Number of bits in message
int msgtype; /* Downlink format # */ int msgtype; // Downlink format #
int crcok; /* True if CRC was valid */ int crcok; // True if CRC was valid
uint32_t crc; /* Message CRC */ uint32_t crc; // Message CRC
int errorbit; /* Bit corrected. -1 if no bit corrected. */ int errorbit; // Bit corrected. -1 if no bit corrected
uint32_t addr; /* ICAO Address from bytes 1 2 and 3 */ uint32_t addr; // ICAO Address from bytes 1 2 and 3
int phase_corrected; /* True if phase correction was applied. */ int phase_corrected; // True if phase correction was applied
uint64_t timestampMsg; /* Timestamp of the message. */ uint64_t timestampMsg; // Timestamp of the message
unsigned char signalLevel; /* Signal Amplitude */ unsigned char signalLevel; // Signal Amplitude
/* DF 11 */ // DF 11
int ca; /* Responder capabilities. */ int ca; // Responder capabilities
int iid; int iid;
/* DF 17 */ // DF 17
int metype; /* Extended squitter message type. */ int metype; // Extended squitter message type.
int mesub; /* Extended squitter message subtype. */ int mesub; // Extended squitter message subtype.
int heading_is_valid; int heading_is_valid;
int heading; int heading;
int fflag; /* 1 = Odd, 0 = Even CPR message. */ int fflag; // 1 = Odd, 0 = Even CPR message.
int tflag; /* UTC synchronized? */ int tflag; // UTC synchronized?
int raw_latitude; /* Non decoded latitude */ int raw_latitude; // Non decoded latitude.
int raw_longitude; /* Non decoded longitude */ int raw_longitude; // Non decoded longitude.
char flight[9]; /* 8 chars flight number. */ char flight[16]; // 8 chars flight number.
int ew_dir; /* 0 = East, 1 = West. */ int ew_dir; // 0 = East, 1 = West.
int ew_velocity; /* E/W velocity. */ int ew_velocity; // E/W velocity.
int ns_dir; /* 0 = North, 1 = South. */ int ns_dir; // 0 = North, 1 = South.
int ns_velocity; /* N/S velocity. */ int ns_velocity; // N/S velocity.
int vert_rate_source; /* Vertical rate source. */ int vert_rate_source; // Vertical rate source.
int vert_rate_sign; /* Vertical rate sign. */ int vert_rate_sign; // Vertical rate sign.
int vert_rate; /* Vertical rate. */ int vert_rate; // Vertical rate.
int velocity; /* Computed from EW and NS velocity. */ int velocity; // Computed from EW and NS velocity.
/* DF4, DF5, DF20, DF21 */ // DF4, DF5, DF20, DF21
int fs; /* Flight status for DF4,5,20,21 */ int fs; // Flight status for DF4,5,20,21
int dr; /* Request extraction of downlink request. */ int dr; // Request extraction of downlink request.
int um; /* Request extraction of downlink request. */ int um; // Request extraction of downlink request.
int modeA; /* 13 bits identity (Squawk). */ int modeA; // 13 bits identity (Squawk).
/* Fields used by multiple message types. */ // Fields used by multiple message types.
int altitude, unit; int altitude, unit;
}; };
@ -2122,7 +2125,6 @@ struct aircraft *interactiveCreateAircraft(struct modesMessage *mm) {
// to the first signal strength // to the first signal strength
a->lat = 0.0; a->lat = 0.0;
a->lon = 0.0; a->lon = 0.0;
a->seen = time(NULL);
// mm->msgtype 32 is used to represent Mode A/C. These values can never change, so // mm->msgtype 32 is used to represent Mode A/C. These values can never change, so
// set them once here during initialisation, and don't bother to set them every // set them once here during initialisation, and don't bother to set them every
@ -2347,7 +2349,9 @@ void decodeCPR(struct aircraft *a, int fflag, int surface) {
} }
if (a->lon > 180) a->lon -= 360; if (a->lon > 180) a->lon -= 360;
a->sbsflags |= MODES_SBS_LAT_LONG_FRESH; a->seenLatLon = a->seen;
a->timestampLatLon = a->timestamp;
a->sbsflags |= MODES_SBS_LAT_LONG_FRESH;
} }
/* This algorithm comes from: /* This algorithm comes from:
@ -2413,7 +2417,10 @@ int decodeCPRrelative(struct aircraft *a, int fflag, int surface, double latr, d
a->lat = rlat; a->lat = rlat;
a->lon = rlon; a->lon = rlon;
a->sbsflags |= MODES_SBS_LAT_LONG_FRESH;
a->seenLatLon = a->seen;
a->timestampLatLon = a->timestamp;
a->sbsflags |= MODES_SBS_LAT_LONG_FRESH;
return (0); return (0);
} }
@ -2450,7 +2457,8 @@ struct aircraft *interactiveReceiveData(struct modesMessage *mm) {
} }
a->signalLevel[a->messages & 7] = mm->signalLevel;// replace the 8th oldest signal strength a->signalLevel[a->messages & 7] = mm->signalLevel;// replace the 8th oldest signal strength
a->seen = time(NULL); a->seen = time(NULL);
a->timestamp = mm->timestampMsg;
a->messages++; a->messages++;
if (mm->msgtype == 0 || mm->msgtype == 4 || mm->msgtype == 20) { if (mm->msgtype == 0 || mm->msgtype == 4 || mm->msgtype == 20) {