From beff2fa9661aa412dbc2ecfd3ed5f8bd5dd97038 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 7 Sep 2017 17:13:29 -0500 Subject: [PATCH] testing box drawing Former-commit-id: 6e30538ac45b91332555d679aff68cea5e5725e4 --- dump1090/dump1090.REMOVED.git-id | 2 +- dump1090/interactive.c | 14 +++++++++----- dump1090/interactive.o | Bin 24264 -> 24284 bytes dump1090/view1090.REMOVED.git-id | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dump1090/dump1090.REMOVED.git-id b/dump1090/dump1090.REMOVED.git-id index 5a235ef..5e56695 100644 --- a/dump1090/dump1090.REMOVED.git-id +++ b/dump1090/dump1090.REMOVED.git-id @@ -1 +1 @@ -890272146e6936b8596ef44ad393d3987dab8418 \ No newline at end of file +f949a3ecfc90cfcc5b1b6fedbb8f447476e22b95 \ No newline at end of file diff --git a/dump1090/interactive.c b/dump1090/interactive.c index 8d36498..07f12f6 100644 --- a/dump1090/interactive.c +++ b/dump1090/interactive.c @@ -444,7 +444,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 Zm m/s D(km) H S "); + "\x1B[30;47m\e[1m Flight Zm m/s D(km) H S "); } else { printf ( "Hex Flight Alt V/S GS TT SSR G*456^ Msgs Seen %c\n", progress); @@ -498,7 +498,7 @@ void interactiveShowData(void) { unsigned char * pSig = a->signalLevel; unsigned int signalAverage = (pSig[0] + pSig[1] + pSig[2] + pSig[3] + - pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 9; //up to 4 bars + pSig[4] + pSig[5] + pSig[6] + pSig[7] + 3) >> 3; //up to 4 bars if (a->bFlags & MODES_ACFLAGS_AOG) { snprintf(strFl, 6," grnd"); @@ -562,13 +562,17 @@ void interactiveShowData(void) { */ //formatted for terminusBold 10x20, no unicode - printf("\n\x1B[%d;31m%-8s\x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%6s \x1B[%d;36m%c%c \x1B[%d;37m%d", + + if(count==3) { + printf("\n%lc%lc%lc%lc",0x250C,0x2500,0x2500,0x2510); + } + printf("\n \x1B[%d;31m%-8s\x1B[%d;32m%5s \x1B[%d;33m%3s \x1B[%d;34m%6s \x1B[%d;36m%c%c \x1B[%d;37m%d", count%2, a->flight, count%2, strFl, count%2, strGs, count%2, strD, count%2, cLat, cLon, - count%2, signalAverage); + count%2, (int)(signalAverage/255)); count++; } else { numNoDir++; @@ -583,7 +587,7 @@ void interactiveShowData(void) { count++; } - printf("\x1B[30;47m\e[1m\n%+3d %c \x1B[37;40m",numNoDir,progress); + printf("%c%c%c%c\x1B[30;47m\e[1m\n%+3d %c \x1B[37;40m",192,196,191,179,numNoDir,progress); fflush(stdout); } // diff --git a/dump1090/interactive.o b/dump1090/interactive.o index a8b1bf0c621e849fbcf157d0970284c2d5f3715a..65c4b4e14d3706c3ad179fb01eb63a81507e1979 100644 GIT binary patch delta 3348 zcma)9e^6A{6@EXs&)rpcyDKY;u(Bu%EP_h>(P%+f-Axu)A`wv_g0?yfw%Sp%I8AL_ z5+u`=*$niKV{FD$lSzV26G?VD0aFpQB|@AwF|ASCQENIGjXJ3q+e94cci+3~kLI5~ zmiwLWyXT&J-nsYPw|nA<`1d1XXQ}mOrJ!BT2|C`a>{`CqHm2TJ6JRFS2trfW>vOGw zS??&-L2#yYeYx0D%2g*<*V2VziDfNUSpasm(ui1MUC-6WL|xsPLZ6k==q+)E^*0t> zO4dObvC|vMH0qa}mVVx~YogwFo<1X$So{v16&Q4Ero&KMTsjL$I_{>aa*5+gj?Omn z=*HPP57Y|6JlZ19wbT^p%76|+3+E-#>UQ2Q6_zF9oN zd3q4)rT`vT^nAuY40Oy#+Cre?^=8xr2^z!Z%8s{t zpkbG*?fb^K>iWP0&Fdax8{>hkag@ngwDFHxMmyTsBNa)=!rkOg!-V|<=sx@hG=1!e z@$|;f77lnjq5)cE%X6@iPkB~*8a$1jH4VqLK=+=FSf}l*C_3qel)b8JQ`b~;v+o^%g1r~ny$mB&#B1UWW|YHtH}=J%X++#ZNokY#1l?2`O>(@?>#i*qAH{!}aV@oBjl0;E-KZ1ABGDd5q-{A(`&EP|f*Gs!tNRvSjMi{Tt z`m8nT=D&t&UpsMr#Pz+)a83YJQDk@??A$9Rpla9@5zc3aX;NqQ6hHIgB3Yg{!c1$B;g3X zU6C!;(#$}P_%SU*dzo%Q+e7!FJwpcrvyJ{^I8<=$q2EI5rJ0pE;)PgQIOL*NNR1o|8$zUBsU_KpoLo-a zN+%q@HVhM&G$)zlD~57rP$$VuQvB^IhB~v9& zDsjpecN7sK=bk2J`K}No)FRiOzBkqs&)vF2r1q$uAI{*Lx delta 3334 zcmZu!X>e256@K?UUqv#QC&`v=c@;*+@`AAnq-GJaj10yLkYHn(uqH*M8*w^@fwCx$ zF%w}#?cS0=r)10zI)-UGOw^=y3e*m%V{p>4g(1*k++{M5ga(U{LYbm|SMQ3Y=^guh z=lkwC=bpQ~MSnR#hEI^L3bSsJ6l=DpG}JBXes->9M17wBGTk=-UKTVs`a4Q=c+)XIE~waOYk&#a0&`<()fHHhq&N;U5D zNm3cxs7x~@&e0T`sH}+fD{fPfOH+j?)i6VX+f*#nULn`AW~dkDYQA<2q}%KW)PMbt zn#S%y&2(!{e^)e|%@$I(=|Sa_8FJVG>b5%OX=;TSt-3~%c-Un&M!#)((W~_ih~C%O zOdVq8Yw9(zvDNh&cd%~VR72TvNty&|J~c0^$KnmSrAF3U8na(Yk{7uLiJ zj;O{M@pN|dVvt^a>x_unOkG%*h*vEcW@}9;x}Lfa{SRgDn@Z(#lznA-(d_D#Tbp<+ z&m2)#(eJYFn{DGO5Efgf&vUz2kJ+-?8W%iY$MTbnj%aKZ>N;n{Ce?Y^hYXz?_uR1H z2tPhwPsp344Bj;aI~w5O_h7L72=S{vYQh5e)xwT7ENV^<{0b~Ks9$x&=Hgd}1_!!hjb_5n=hmB&I3YEv-M&9UWk3}gPEU~05Q<7Y9wE68@Rf=@MGMg(Ov z!6BjsnuXCk2+#Lol^{h2cSlA0_)-JUKub!EMXVCoJOJ%9G7YOuFrPtuGfmb;J%fjPtSd!?-#t5=gWOoj9zRmBL&VA)5az3J4x_FdyvG&920Y|3Mxw`DQ@2onj$rX zorS4n)=BZSBB*m z#?7*a(l^GPC%P7^Y)QT~ysxBHCQDf2)X8Kd?40`HxU9{|l9b+uV%uR@2_FA@xlse- zK-fAvhmsAfykb3hn)OtKWJeF1?U}UJ(Sm>yrMoXcu+&Kxh#4FNP-0RgK%(OO?L$En-3AA17qlpK+p+mdb>X!UYIf%xQ!C zHYQlO9ejxMW%6#GGFLB2XE<++^-tz&cNUIGE9CSZ_{Ns-6pX#Bbl&eW6u9yhKlP)i zhPSIp%qgd4d>~Ht|L>l4R8)FFVEnv&A^4X9i^UGd4}nKT_B8gi_p%&GX2z;r&NkgK-M@Tp*i zx&qS2oVcE4&A9GoZMY7wBX#&1cu(`+!2SxYg&FD#$d$0O{t#8p9t;qC`9i@~ij!V?2 z{9E!-dWSyMOsRg|Vme;mO{wlpN_6^KD(QpNmRL*8`b~7=q0=-`d9byW8g%c{Ox-SO z_z}%-rUs=gp$ij;ZXKp39q)zUqYh>7wmH<0r?kwW7DPWsbNA8`{cdV;QPVO+-Bso& z-P?T182hlHIw198ztSaX%5H%!U=DaW5L;Sr7y4Tu_%xmJ6JQ>&4TwM2_i(|7?35ay z8GIfv4SY5b=g~DCmrwIDlixP8Xn9Oq=4i)4}&|r59AJ;fcT!C^0MGgAWpmG z9v*vmSy*lWIscQuA%RDMxD%%w6nvk+R)OCU*Z}1D7XxVki6#mmiwofQabNI(27xHn zbri@04g-0AQ1G3CzX0R~-NgOH{jLMK-wDC{1b+j_{k94HC17~}vfq-7-(aC|3+R3+ s&@M15IlRj^L?*_6L>$4XpMX1Nz4+yjjdYy1upcg8O