diff --git a/dump1090/anet.o b/dump1090/anet.o index 78e8fd7..7756edf 100644 Binary files a/dump1090/anet.o and b/dump1090/anet.o differ diff --git a/dump1090/dump1090.REMOVED.git-id b/dump1090/dump1090.REMOVED.git-id index 902ead9..5433ad4 100644 --- a/dump1090/dump1090.REMOVED.git-id +++ b/dump1090/dump1090.REMOVED.git-id @@ -1 +1 @@ -a12e9b1c39fb3432f7175cecd1ca3d8fc490e2f5 \ No newline at end of file +e328571ee755d40455f14ff797c85de516b3cf0c \ No newline at end of file diff --git a/dump1090/dump1090.o b/dump1090/dump1090.o deleted file mode 100644 index d4608b9..0000000 Binary files a/dump1090/dump1090.o and /dev/null differ diff --git a/dump1090/dump1090.o.REMOVED.git-id b/dump1090/dump1090.o.REMOVED.git-id new file mode 100644 index 0000000..55d3868 --- /dev/null +++ b/dump1090/dump1090.o.REMOVED.git-id @@ -0,0 +1 @@ +f9454b21fbaa395742eefee887a437a2bcf85b60 \ No newline at end of file diff --git a/dump1090/interactive.c b/dump1090/interactive.c index 69bf625..81657c3 100644 --- a/dump1090/interactive.c +++ b/dump1090/interactive.c @@ -441,7 +441,7 @@ void interactiveShowData(void) { printf ( // original version "Hex Mode Sqwk Flight Alt Spd Hdg Lat Long Sig Msgs Ti%c\n", progress); // pitft version "\x1B[30;47m\e[1mFlight Alt Spd Lat Long \n", progress); - "\x1B[30;47m\e[1mFlight Alt Spd Dist Dir", progress); + "\x1B[30;47m\e[1mFlight Alt(m) m/s Dst(km) H ", progress); } else { printf ( "Hex Flight Alt V/S GS TT SSR G*456^ Msgs Seen %c\n", progress); @@ -450,7 +450,7 @@ void interactiveShowData(void) { //"---------------------------------------"); printf("\x1B[37;40m"); int numNoDir = 0; - while(a && (count < Modes.interactive_rows)) { + while(a && (count < 10)) { if ((now - a->seen) < Modes.interactive_display_ttl) { int msgs = a->messages; @@ -527,7 +527,7 @@ void interactiveShowData(void) { if(fabsf(dLon) < .01 && fabsf(dLat) > fabsf(dLon)) { cLon = ' '; } else { - if(a->lon < 0) { + if(dLon < 0) { cLon = 'W'; } else { cLon = 'E'; @@ -538,7 +538,7 @@ void interactiveShowData(void) { if(fabsf(dLat) < .01 && fabsf(dLon) > fabsf(dLat)) { cLat = ' '; } else { - if(a->lat < 0) { + if(dLat < 0) { cLat = 'S'; } else { cLat = 'N'; @@ -547,7 +547,8 @@ void interactiveShowData(void) { snprintf(strD, 8,"%7.03f", d); - printf("\n\x1B[%d;31m%-8s \x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%8s \x1B[%d;36m%c%c", + //formatted for terminusBold 10x16 + printf("\n\x1B[%d;31m%-8s \x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%8s \x1B[%d;36m%c%c", count%2, a->flight, count%2, strFl, count%2, strGs, @@ -558,25 +559,17 @@ void interactiveShowData(void) { } else { numNoDir++; } - - //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)); - - // printf("\n\x1B[%d;%dm%-8s %5s %3s %7s %8s",a->addr % 12 > 6, 31 + a->addr % 6, - // a->flight, strFl, strGs, - // strLat, strLon); } } a = a->next; } - while(count < 14) { - printf("\n"); + while(count < 10) { + printf("\n"); count++; } - printf("\x1B[30;47m\e[1m\n%+3d %c \x1B[37;40m",numNoDir,progress); + printf("\x1B[30;47m\e[1m\n%+3d %c \x1B[37;40m",numNoDir,progress); fflush(stdout); } // diff --git a/dump1090/interactive.o b/dump1090/interactive.o index a151a6e..eabfd72 100644 Binary files a/dump1090/interactive.o and b/dump1090/interactive.o differ diff --git a/dump1090/mode_ac.o b/dump1090/mode_ac.o index b5745f4..cd90dd6 100644 Binary files a/dump1090/mode_ac.o and b/dump1090/mode_ac.o differ diff --git a/dump1090/mode_s.o.REMOVED.git-id b/dump1090/mode_s.o.REMOVED.git-id index d8d6079..98ac780 100644 --- a/dump1090/mode_s.o.REMOVED.git-id +++ b/dump1090/mode_s.o.REMOVED.git-id @@ -1 +1 @@ -bdd60b55bc0624ff84544a794ae21d71eaf0adc8 \ No newline at end of file +d5ebbbdea727d372f6d868a8f114fdb2c4dfe1f5 \ No newline at end of file diff --git a/dump1090/net_io.o b/dump1090/net_io.o index 92db651..1e0ff3f 100644 Binary files a/dump1090/net_io.o and b/dump1090/net_io.o differ diff --git a/dump1090/view1090.REMOVED.git-id b/dump1090/view1090.REMOVED.git-id index 7304f82..d074ade 100644 --- a/dump1090/view1090.REMOVED.git-id +++ b/dump1090/view1090.REMOVED.git-id @@ -1 +1 @@ -8e54cfa965ac942c81c1742f1abe3a82b9a8412a \ No newline at end of file +e8e8d968d4f4aec851cfe3bae4e8ad926f7f7b65 \ No newline at end of file diff --git a/dump1090/view1090.o b/dump1090/view1090.o index a9231fc..06feb04 100644 Binary files a/dump1090/view1090.o and b/dump1090/view1090.o differ