tasiaiso/viz1090
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nmatsuda/spidr

Browse source 
Conflicts:
	dump1090/dump1090
	dump1090/interactive.c
	dump1090/interactive.o
	dump1090/view1090

Former-commit-id: c74c830b3cc2e8c10570a973b7fa4856cae54ad4
This commit is contained in:
Nathan 2017-09-11 17:45:56 -05:00
parent afdb4a8305 565c65c0e9
commit 699cb644db
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dump1090/dump1090.REMOVED.git-id
View file

@ -1 +0,0 @@
6e78e92e9261a1c1a12064288f64a1786a246ec6

BIN
dump1090/dump1090.o
View file

Binary file not shown.

11
dump1090/interactive.c
View file

@ -572,6 +572,7 @@ void interactiveShowData(void) {
printf("\n "); printf("\n ");
} }
<<<<<<< HEAD
if ((now - a->seen) > 30 ) { if ((now - a->seen) > 30 ) {
printf("\x1B[1;30m%-8s%5s %4s %5s %c%c %d", printf("\x1B[1;30m%-8s%5s %4s %5s %c%c %d",
a->flight, a->flight,
@ -589,6 +590,16 @@ void interactiveShowData(void) {
cLat, cLon, cLat, cLon,
(int)((float)signalAverage/25.0f)); (int)((float)signalAverage/25.0f));
} }
=======
printf("\x1B[1;31m%-8s\x1B[1;32m%5s \x1B[1;33m%4s \x1B[1;34m%5s \x1B[1;36m%c%c \x1B[1;35m%d",
a->flight,
strFl,
strGs,
strD,
cLat, cLon,
(int)((float)signalAverage/25.0f));
>>>>>>> 474b6b928fbf41ebad522ee55fae952c481aabf5
if(d<5) { if(d<5) {
printf("%ls",L"\x1B[1;37m│\n└──────────────────────────────┘"); printf("%ls",L"\x1B[1;37m│\n└──────────────────────────────┘");