Merge remote-tracking branch 'origin/master' into Debug

This commit is contained in:
Malcolm Robb 2013-04-08 23:53:08 +01:00
commit bbe96b6afd

View file

@ -1822,12 +1822,13 @@ void interactiveShowData(void) {
printf("\x1b[H\x1b[2J"); /* Clear the screen */ printf("\x1b[H\x1b[2J"); /* Clear the screen */
printf( printf(
"Hex Squawk Flight Altitude Speed Lat Lon Track Messages Seen %s\n" "Hex Sqwk Flight Alt Speed Lat Lon Track Msgs Seen %s\n"
"----------------------------------------------------------------------------------------\n", "-------------------------------------------------------------------------------\n",
progress); progress);
while(a && count < Modes.interactive_rows) { while(a && count < Modes.interactive_rows) {
int altitude = a->altitude, speed = a->speed; int altitude = a->altitude, speed = a->speed;
char squawk[5] = "0";
/* Convert units to metric if --metric was specified. */ /* Convert units to metric if --metric was specified. */
if (Modes.metric) { if (Modes.metric) {
@ -1835,7 +1836,11 @@ void interactiveShowData(void) {
speed *= 1.852; speed *= 1.852;
} }
printf("%-6s %-4s %-8s %-9d %-7d %-7.03f %-7.03f %-3d %-9ld %d sec\n", if (a->squawk > 0 && a->squawk <= 7777) {
sprintf(squawk, "%04d", a->squawk);
}
printf("%-6s %-4s %-8s %-7d %-5d %-7.03f %-7.03f %-3d %-7ld %d sec\n",
a->hexaddr, squawk, a->flight, altitude, speed, a->hexaddr, squawk, a->flight, altitude, speed,
a->lat, a->lon, a->track, a->messages, a->lat, a->lon, a->track, a->messages,
(int)(now - a->seen)); (int)(now - a->seen));