From c06c697e2644612997d6096e6d0e29f87e7898d7 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Sat, 23 Jan 2021 17:48:49 +1100 Subject: [PATCH] When using a --interactive-ttl of more than 99, the alignment didn't work out. --- dump1090.h | 1 + interactive.c | 5 +++-- view1090.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dump1090.h b/dump1090.h index 088d3f6..9abceb4 100644 --- a/dump1090.h +++ b/dump1090.h @@ -336,6 +336,7 @@ struct _Modes { // Internal state uint32_t show_only; // Only show messages from this ICAO int interactive; // Interactive mode uint64_t interactive_display_ttl;// Interactive mode: TTL display + int interactive_display_size; // Size of TTL display uint64_t stats; // Interval (millis) between stats dumps, int stats_range_histo; // Collect/show a range histogram? int onlyaddr; // Print only ICAO addresses diff --git a/interactive.c b/interactive.c index 3e36448..c97270a 100644 --- a/interactive.c +++ b/interactive.c @@ -180,10 +180,11 @@ void interactiveShowData(void) { snprintf(strFl, 7, "%5d ", convert_altitude(a->altitude_baro)); } - mvprintw(row, 0, "%s%06X %-4s %-4s %-8s %6s %3s %3s %7s %8s %5.1f %5d %2.0f", + mvprintw(row, 0, "%s%06X %-4s %-4s %-8s %6s %3s %3s %7s %8s %5.1f %5d %*.0f", (a->addr & MODES_NON_ICAO_ADDRESS) ? "~" : " ", (a->addr & 0xffffff), strMode, strSquawk, a->callsign, strFl, strGs, strTt, - strLat, strLon, 10 * log10(signalAverage), msgs, (now - a->seen)/1000.0); + strLat, strLon, 10 * log10(signalAverage), msgs, + Modes.interactive_display_size, (now - a->seen)/1000.0); ++row; } a = a->next; diff --git a/view1090.c b/view1090.c index c27a47f..2e96a74 100644 --- a/view1090.c +++ b/view1090.c @@ -168,6 +168,7 @@ int main(int argc, char **argv) { Modes.interactive = 0; } else if (!strcmp(argv[j],"--interactive-ttl") && more) { Modes.interactive_display_ttl = (uint64_t)(1000 * atof(argv[++j])); + Modes.interactive_display_size = strlen(argv[j]); } else if (!strcmp(argv[j],"--lat") && more) { Modes.fUserLat = atof(argv[++j]); } else if (!strcmp(argv[j],"--lon") && more) {