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

Adjust --interactive display

Browse source 
Allow 8 character Longitudes to cope with -179.999

Change the type of signalLevel to unsigned chae. Negative signal levels
make no sense.
This commit is contained in:
Malcolm Robb 2013-04-28 16:24:33 +01:00
parent 8ed0574ac8
commit 748f2f5e91
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
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.2704.13" #define MODES_DUMP1090_VERSION "1.04.2804.13"
#define MODES_DEFAULT_RATE 2000000 #define MODES_DEFAULT_RATE 2000000
#define MODES_DEFAULT_FREQ 1090000000 #define MODES_DEFAULT_FREQ 1090000000
@ -139,29 +139,29 @@ 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[9]; /* Flight number */
char signalLevel; /* Signal Amplitude */ unsigned char signalLevel; /* Signal Amplitude */
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. */
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 */
long modeAcount; /* Mode A Squawk hit Count */ long modeAcount; /* Mode A Squawk hit Count */
long modeCcount; /* Mode C Altitude hit Count */ long modeCcount; /* Mode C Altitude hit Count */
int modeACflags; /* Flags for mode A/C recognition */ int modeACflags; /* Flags for mode A/C recognition */
/* Encoded latitude and longitude as extracted by odd and even /* Encoded latitude and longitude as extracted by odd and even
* CPR encoded messages. */ * CPR encoded messages. */
int odd_cprlat; int odd_cprlat;
int odd_cprlon; int odd_cprlon;
int even_cprlat; int even_cprlat;
int even_cprlon; int even_cprlon;
double lat, lon; /* Coordinated obtained from CPR encoded data. */ double lat, lon; /* Coordinated obtained from CPR encoded data. */
int sbsflags; int sbsflags;
uint64_t odd_cprtime, even_cprtime; uint64_t odd_cprtime, even_cprtime;
struct aircraft *next; /* Next aircraft in our linked list. */ struct aircraft *next; /* Next aircraft in our linked list. */
}; };
/* Program global state. */ /* Program global state. */
@ -2627,7 +2627,7 @@ void interactiveShowData(void) {
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);
} else { } else {
printf ( printf (
"Hex Flight Alt V/S GS TT SSR G*456^ Msgs Seen %c\n", progress); "Hex Flight Alt V/S GS TT SSR G*456^ Msgs Seen %c\n", progress);
@ -2695,7 +2695,7 @@ void interactiveShowData(void) {
if (flags & MODEAC_MSG_MODEA_HIT) {mode[2] = 'a';} if (flags & MODEAC_MSG_MODEA_HIT) {mode[2] = 'a';}
if (flags & MODEAC_MSG_MODEC_HIT) {mode[3] = 'c';} if (flags & MODEAC_MSG_MODEC_HIT) {mode[3] = 'c';}
printf("%06x %-4s %-4s %-8s %5d %4d %3d %-7.03f %-7.03f %3d %6d %2d\n", printf("%06x %-4s %-4s %-8s %5d %3d %3d %7.03f %8.03f %3d %5d %2d\n",
a->addr, mode, squawk, a->flight, altitude, speed, a->track, a->addr, mode, squawk, a->flight, altitude, speed, a->track,
a->lat, a->lon, a->signalLevel, msgs, (int)(now - a->seen)); a->lat, a->lon, a->signalLevel, msgs, (int)(now - a->seen));
} }