From c8da1b3ba619053d946f306b0377d5ab7dad4afb Mon Sep 17 00:00:00 2001 From: SeekDaSky Date: Thu, 18 May 2017 20:43:32 +0200 Subject: [PATCH] ControlTerm - final --- ctrlTerm/commandTerm.jar | Bin 12752 -> 13121 bytes .../src/ControlTerminal/ControlTerminal.java | 8 ++++++-- ctrlTerm/src/ControlTerminal/Plane.java | 2 +- .../src/ControlTerminal/PlaneContainer.java | 18 ++++++++++++++++++ viewTerm/src/ViewTerminal/Plane.java | 2 +- viewTerm/viewTerm.jar | Bin 10210 -> 10210 bytes 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ctrlTerm/commandTerm.jar b/ctrlTerm/commandTerm.jar index 562e7b46dc97fd847bd2fca800bd2b94b2a765c1..a4f6a3df90232c789a3c1524731fd04ec533e7e0 100644 GIT binary patch delta 7086 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 delta 6792 zcmZ8mWmFVgw;q9!mXPl5M!KYhp+P_zhLR5H7`l51=^T*ml#uSO0R$<@krHX}>ieyG z*ZbXbew^CR+2`yZd#}BpUh5e!wgw0pg#dtth6aeYDoMtUM)oo&fp#*oAs>TF8V?y4 zk^hSo%gf^F;tHt$&Z z&LFJ;-AK!z*`#PF`bOQd)Qsd63@4zn5~m}*x5l$ss^CvAHjbs9S?rq53?pIsQ6=Dh zC1PXR?VKNQ^>9AT-GfZhyDZ&=Ho#OB0yexQ?Kk1Y^bI^PFySVVz5%YD9#`Jss%Avg zaD5emG$aH`*?-3hKG@w`Y6546!+4*af84<8Qa=b_+Z;cV4_?xm<#9uL*7#v+MhUm| zz1tke$Eo+h66Mu-d=Ho3ip*XTa3E28+QEa3cX<~f>{!9;WCnO<UV;0QhTSJ6HjzPr(vi>$zvX;YS`%%?V?jd+=EwXa+} zYJ=Dk?QfTc?WCnn7VztIy*g`$h^t2|%M^spRXknNDHepnO@|*56BD=PnG=iUvnAbj z2I0F6Rv9Ti?&W4-%W%FhF&&ZfTl%-Lz0y8rh-2-d0gAK@iQpejRarwJfV3taV2i4l z?^Q2h*TItGO#M*4utGF@IV4a##OfKsJXe;JUfL@l6j z6!X>ijosD;-Ef_l!qv@4)@u zSj*hjk(!1vg1ck@#h_$>z+cM(KaiC-UYC^@ujLlNO8kUNOcW2PK3tCKs(PlK;Ad&3 z%GwqTyhBgnlT=-$5Tx;Oo{Je-WLUXW!ug!0i|zX*oC|F(5QipLN&v8OjBbgG+5(8y zJ|Pb-87b{S$DN`;rMf_wTSv3(VNNo4rdf}F9WlCR_L9b&ctl#A=3Ie>KJWDlALM8u zBoQ@1<}5&T+v^t)KcquP6t}sTBZ5e6i*2>DH*sa>c+Ny!@f=ghlebJ9t42hM67Lwu zf{iXv+$PB16yc39tQfsVl5-EHD66dYk55WS>V9w*K>mI#dfTBH$)q9cj#NArs$axD z)j@tv%r|DLfn(~ms2lY8GEnw3akf4q=k9doC%f9Dyp(?^q|twQnHR6?O}>Yv$yofT zHMzE3u{-5*(R@?yb&*;^qkrRunJ($&g~B2<1UG7`KGjz0G8EIs)gE=uZ<_(JFrAf*1j z*i)IjWV|dDLf?+P)x{ZIvsL3_O3X=WS&{I=uN8%>_4Jk$1Vv`kV?VC5LG?e@&!yB* z@}&zuslctp=z2>_8}3o%*kbsLnq|&hszgdUx}#gRx=|(GGwo!HzQZ!Hd@g?}xCaq} zGsAg9VLF0;uXT5SWU2u|Ma$9+pL+`g0PZjW01eO|H~Sxd{MP{&U}io;wzVpOien2y zF#WZ^6aLQ6Zn|#ig5j{>W8i;LjNu$a0?x5D!Cu2&Gs2p62G%ZHuuGKQI0fCw5eycF zs6S`xF8y>vvaQt=RV$J?wJ%8Neo~k{G1=aJxc61Tt2_IZ<0{R}lNX#7QN<)AA(MvU2gVU;NnOf@m4to*rhexs>2EvMXt2B{ zYb*5IZQnTtsJ;!a476HLf&D_MptWp>NGiOIdp=3N#QAzkJ}kMW;ud*@eQ(Ox;D;NY zoBh4V=eUC5Ws}m^j3sHQD%s-UzsvBo#w8>ZUAcOZTMY4zr=Z3}W?&4IZ5)*9w3V+Y$;*WR!Wh=Keoijkv%|YLh$QO3F#uNp{;eq1d;4 z3e13=BMegCvKU^H@rb+rI875B_zrgsSSj?oM>TYvd>C_AC?h8$;rt^D7^yfjOmpzP za4roh%INsgu1E@L@urG(mW73YJVfEy76Ej;jC{~tK-M0|E|;svui2@jKRD+Dfki`H zQMW)qr>#{+pSaNUg$gZ8*77)j3~QA|QB~Rze~Pd0liZ-r6hlc{R|k=0T0(H= zqd$zz+Kj0mAGa>fO@~R3wLf#>PL$IwfOhO{4)Rne0Vl~q2Z_9*w7Zq)9;84^0cb8~ z)D*!@SY0hGL7=4>-kziWqeFA0S^wBFpNSET-GFWoX0D@B?g;HR$JVI zrBA{*m@73&C-#hSt_xKCnGGzz=?G(iJroP;9X8cmx|Q0l-DjHCq2WnqYp^1!asAVd z0wNkXJPC{n(;NiaTGYJ@hP>lT!^mo%iH#AS4lwGZ>Y1imSPuJ@WR4TQ?&Mj(i6AUu z4`b1@?>@Wy=$aoI`_|T$_7l@5UR<Lj#_l;L&2} zhcX;?%;p!P-i((HLz8`xWWZ}&w>_T_Bd=$T*zk6B5{#3b4Tz-rvZ3KexM}8I8LIGT zXGiV&fy*kP_z1ATxX;l-h${KqW&445UU{&%$cM$+oXq#l5E$L)7p1s?!F)ZcdK8Vs zXfoBuM^L|HK1q7%x?i2%pf=raE$=*3Y*O{cM<#dpnRl$QQ~bS>hDv`_j1z+SjfLG+ zViy^;&;uL}f(%QFvo9g=Ued6}>VKfl({`QV;L7jbz=ayO-G{^wpW_od5@0pr@f1ig zsOXCV>SXRkC&4@~t^^@Tg;+pu?jrUZJZIHDnQ2-=sUiES$naOrwlf;>PEKPO>FhV? ztt+B=cC_m?v2k^%awaPQdt9;~Z%boZ!{i%y8WjePAe5d}$&Cf;CwOZ0VXRaO@n#uu z`B!h-qK(5z%$oC(Xy*|7Y#aUe4g`vh$+l-c0ob#<#s%S`A1BbLhEVweGjYS=JGP%VuI3*!aIIa*dAJ1AZ8;?iygF-s;T6rda)j0K@ z%RScTt=357>Q3W&u_@10fm%)d?GN_BedSXcLE{y#d-uQA-lg4KdW4LF!v-ZU(4I=S zF(1|`)`r~bD?j0_RdACI%8@Ry!he@-$wuxhW zIiMoC_Wm98-M2%WBhSD&1R@t+H3V?|KzNTKyzjk zYrK(oJ0v`j>_Q(4RrZMYMsb-Ngs}!7j$v|bc9E|fdhMBXFGmK1qjGk*obi3=7+MVg zLq8Y^P}%B}&-V%VF@1~^UdOB;?{r3w>M(_*xX2u1T;|SUq_A>RXSwe;q^P)q27XMZ zrm<$zpI$_UItAn@9+2^lB#+8qQg;aN-=J}rztTz?b8fgTJ@X@*+c_nDpm*(q?AjA) z$K0y&aL>s^T#tiBb`jma^X8HCl+bvr$gwWDEiB zHR~FsBZlWbd55}juMU!p`(WQfg0@wf-#L~OiG*Ng(t1egidvEPv=gJBTxl_?v)Wuy zRXL6QKt%NLgb3h;y=zPC$Sc3aGs1_RD6DQ5p>cg%3ypWU6NvSzi#}Zzsg{6G;Cyo} zy)*-9YtkBKe~Ty2Etj__baVi&`D9Oy^?hrGp{*K+46|ZNHS*)ItYiv8L`=QQ2v$gf zK8L^j>^+F^4_3|MoFr3ZR4t(6LXC|1D)!~_e&zD(sr=bYZ`-2;eBKiDV`vA@zX$a` zE3Xfy<2;UkJ)NrenN16)SjfJY#gY=&UBm0r>jF-(>ohczb!k0}?PC=JyKgL$@c85@ z3TZzv1+kg7&tCR88v^tXkVdq?*?3d2$V~1Qb05;BCA2`|-c!>rcsABXH}lW>K-I8! zAy@l1bar`nEE7GT8|DiQhFg-S-2NWIkX!D@iIxd*fsmd(D=T(#C$7oW_~*T6iM?2+ z->qPBJsB~lrZ`VeswU|ak9h;VMAA2=aWi5$48f|-jvS)>qhnj6knxyEriAtaRp%zy z3LkwcSz*)5eyNtD*-RA@HBve{Ma<&%F~ZE~{d4@9g6Tu{yDUB!R=Hf(lvl=O-iMET zt|QxxH#Z#Cgm0C_W`{oJ4sjL+k@qpAb8W}uP1q8FkxF@*Q5HYOgnyhW`$cLyq|$V; zwT{WWRDhLHNTJ7n0$BzNww%vi>*{Rc=`>(3dXxSBe;59P%fDEpiaImJ1;A|>Wfy;bf=5<&Uf=!g7>wC(}P*f6JYTSRNzFn>Cd zxP4{>)wm2r9V91lpF>sH_FeQoC#QFB1DSck1Ur$GNpsj))w*iKPrQ%mP3NF}jTe3P-@w+3s{Cs6IEK?Bz`YM8ClYDx`IT!D-S|1!) zO6xzc4L?|w%m_C$BG%@(miY4WUw~TYQ4+!lsg;Cg-a|f!+TY4_W2QH3N-tl2r zNs<*3yC=IFaXr2Co#oKB=FV6@XJFyl5-~?7RkW0x`>55GL&VG`%^Tgf1Dbh_e&5E+ z+=Z3is)I9)og_Y0N|1Q%~SrBra&>tgdl5% ze2? z*Y;iZi_h5ukDxgFx8gSkq0>+3Zh?MGg<)Z*^Zwr~uT1P~znNSM{C@m-PyNg&Rs`sQ zlzrDw>S)D}>S4di)2w32Qk>brUr#TDERJ+LiTc~qPj^A)ZuYsj>7tP@~{dFDLS1YA6%82*yu2;+iR78-oORM<~ z>R-0H^Q?(mQY_p`uEUanzbc>j~QQsAO2uSRo~j)V+*g_ic}P ztHC;UP$Ssb!prOTTK#Z{muwUA&0QR}??7+AM;L}8$Q>DzJ=_$RypcW2M4Wgx8(fVc z3haZdU=ivS#hMtonQ2DH7uID z%0{-*%{#s-sN81`Q1%a@ixz4zJgCnSb8}Q=Bq4&8y}Lxv0!R;C;-q%MwN1-&3$z{UJTUBNf zH^7~s-mRET+yY~cauQp1DIsD9L0R%l0g^Rzz*XZ~*!(!f+aYm|>W><{(X65|g>l(V zuikHvBzzJ+LgB1kYkkw#gwd$-Mp;H}FxRTjTxq1Tji9gX;N!R zS!l#yK2HikUBP7|VWS$NfAz)edIrJqdAtK-#XDLpX!tBFWcc0eq7k9`HfzV&LgL!^ zOMA`fTyKTJMm~sLcj_AR&pG4iO7Ca(2a!#M;~*2Qb3PMuANBXQk1wdeLx7yVV+<3p zYxT^%juEYSr^uvZdoQ6F7Tz%COO@;_B~^Y))&{?!Pvs&`B1*$LYOXcA#4xt|pwtw9 z5rK*jHA4=^(rNSMc>HGCeVH0lbIS{-Q1zVNPdU=VT|P!T^eP|vVV9q-j@`l;gI!o{-bzS;k2IMhdAu;Z zJkHLy5bjG9mi|IX!{$@JG23D_WzNLR*4P5ZN zD%eA51kWIoQxUNs@2=E}owc=DAEN4g&4(8PU)GjI(2l=qGorM2gxQd=Hi@+8m>aiH zu)nFoW;b*6d_}+)KWfiB*}qN{ZE#Hv~3=<<@aiDR)jYJazo7^ueikQg@}i0=O^KtOL)fKU zJ7%KMYW7e^;vWV`1_UYkJlZJN%+G$BKiB-)PwSbIi_k>$xli;j&qQ8}m`Dv%5!4g! zyC4S+N^ZFfi-5&Cn#wNoH*NGW$6WW)`Lb1Z!G) zacJBV$}jip4f7P5IIGqM;gwP8Kk|Jse3<(49e}szizd^YFUI02U zpz1tS|KMGC$dL{(pz%EHG=J6pyKqSUUl=-EDDHF0f0X?1^Zx>h@<%Y`p8bj7NB{ua ze*wM_LTP!0Y5tTNmH!>)8UIVjh!_gOW`-8i0P{~*`(rN$uD`4Q0l(~r8~^|S diff --git a/ctrlTerm/src/ControlTerminal/ControlTerminal.java b/ctrlTerm/src/ControlTerminal/ControlTerminal.java index fea2a93..a9999ab 100644 --- a/ctrlTerm/src/ControlTerminal/ControlTerminal.java +++ b/ctrlTerm/src/ControlTerminal/ControlTerminal.java @@ -167,7 +167,11 @@ public class ControlTerminal { plane.setSpeed(data); flags = (byte) (flags|0x04); break; - } + default: + System.out.println("Wrong input please retry"); + s.nextLine(); + break; + } }catch(Exception e){ System.out.println("Wrong input please retry"); s.nextLine(); @@ -180,7 +184,7 @@ public class ControlTerminal { break; } } - System.out.println("flags: "+flags); + container.setExpectedFlags(flags); buf = ByteBuffer.allocate(27); buf.put(flags); buf.put(plane.toBytes()); diff --git a/ctrlTerm/src/ControlTerminal/Plane.java b/ctrlTerm/src/ControlTerminal/Plane.java index a437024..adb19cb 100644 --- a/ctrlTerm/src/ControlTerminal/Plane.java +++ b/ctrlTerm/src/ControlTerminal/Plane.java @@ -98,7 +98,7 @@ public class Plane{ case 4: if(this.isDead){ return "\033[4;37;41m ATTENTION: avion hors ligne\t|\033[0m"; - }else if(this.speed<50){ + }else if(this.speed<300){ return "\033[5;37;41m --Speed: "+this.speed+"\t\t\t|\033[0m"; }else{ return "\033[0m --Speed: "+this.speed+"\t\t\t|"; diff --git a/ctrlTerm/src/ControlTerminal/PlaneContainer.java b/ctrlTerm/src/ControlTerminal/PlaneContainer.java index fdbb4b4..ba82d67 100644 --- a/ctrlTerm/src/ControlTerminal/PlaneContainer.java +++ b/ctrlTerm/src/ControlTerminal/PlaneContainer.java @@ -12,6 +12,7 @@ public class PlaneContainer { private HashMap map; private AsynchronousDatagramSocket socket; private Printer printer; + private byte expectedFlags = 0x01; public PlaneContainer(){ this.map = new HashMap(); @@ -25,6 +26,10 @@ public class PlaneContainer { this.printer = p; } + public void setExpectedFlags(byte flags){ + this.expectedFlags = flags; + } + public void notifyReceive() throws InvalidFlagException{ DatagramPacket packet = this.socket.synchronousReceive(); @@ -41,6 +46,19 @@ public class PlaneContainer { //System.out.println("Processing "+nbrPlane+" planes"); + if(this.expectedFlags != flag){ + System.out.println("\033[5;37;41m Plane could not apply data \033[0m"); + if((flag&(byte)0x10) == 1){ + System.out.println("\033[5;37;41m Plane crashed gracefully \033[0m"); + } + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + if(flag == 0){ //this is a ping response return; diff --git a/viewTerm/src/ViewTerminal/Plane.java b/viewTerm/src/ViewTerminal/Plane.java index 0e11ede..00579a6 100644 --- a/viewTerm/src/ViewTerminal/Plane.java +++ b/viewTerm/src/ViewTerminal/Plane.java @@ -95,7 +95,7 @@ public class Plane { case 4: if(this.isDead){ return "\033[4;37;41m ATTENTION: avion hors ligne\t|\033[0m"; - }else if(this.speed<50){ + }else if(this.speed<300){ return "\033[5;37;41m --Speed: "+this.speed+"\t\t\t|\033[0m"; }else{ return "\033[0m --Speed: "+this.speed+"\t\t\t|"; diff --git a/viewTerm/viewTerm.jar b/viewTerm/viewTerm.jar index 5dafac4bbe05a96a20f145b11687d99b7a57167c..0c8f5a6c46ebdec9cec5078cde7c3af2ceb5d685 100644 GIT binary patch delta 1318 zcmV+>1=;%IPvTDuP)h>@6aWYa2mq&Tkqoo~lWnoW)&l~QZL^vLBnASLZIi$XDFTyi zv+D{61pu6I}T!*f# z3p(1-A<(&G70l(`olUcxe=#=mQdBW({b(hrM@8SqEw2c5T8kDR61`(cD#vneQI3|uB+Y?)#D0sX09(ea<^i412n#>DjujD zo1UCyDq2>}FliUu0B%sFQvdVwgZ8c0={&z{<#T2^fR6;aA{&#le^;-~PEPE^S^P{q zh&jyjCMMastz!{)2-+x>%mU%1+-h@b$WB3+_oxh-rtNXC`#L^Gg49-vYFPje8W673 z5dv7D6CK$Y-ywwy#bP;EnTdbL5k6s@M|5u7igJ=PLr0ey-k0y=+Fk&(QF=X|QQ{1= z5hD%SZ)Gxz%bE1bfAUP+cx4p}@$F){63<&(1ykE&&j6m%$%$-C)jd)vxnUgZ8A)P| zYTXNg4m;QJicJAJ&%zRDU#%M1FCQ2s`_Kkgi@W8ldB>6+d00nT7zW9~LpPtUJ>MX* zTKN9RROL}S;JdnZOqxTS{1O@d{K#f9nP{^|gp`YF{bmJ1jNTLT9Y1KWIhQ@{f zX)(T#77J*R7EAC*i$!>)#WGr@#X{KUeI#uBF|HrAt;shC?;nGy!2L3@t`^vd1%?Sp zIp3t!oYp6Gf1k(-%F!tKoR<-L)T(22pN%dEX~YGj_g4qVpeslUqo+V3RC_1LCGr_+ z0>YK!#AB`?{Z5c!SCDackbWmfihM?!fM_X4a;slu@pXnwbK^x?% zD@fD{a@`fAo&H%*I}bXY=Uknq+*L%KDsGX_d=nLIf3}KgR~0cQ$f7IAHFuDh6C_PO z_nUy|HpmBbomH$!S|emE?|(i9D%LW^T4|v19n)OLjEW$(>5B8(qsVKScCjVa zH{PdR=%XQ1?#~zh0#Hi_2uz|J$Z-S!05A#w4FFI}0|XQR2nYxOlWntW8|4QAlWnt7 zBbNaJr)`t#B!L2xZIf;#Qv#E1lfxxj0+Vf%ASO8ilWmh*CPo62ZIh!WOAV84q)JSp c9LRA5001zP`zAR8lWmhWCrtvAZIgv3U0%*>R{#J2 delta 1318 zcmV+>1=;%IPvTDuP)h>@6aWYa2mrBTkqoo~rDCzd)&l~iVzZhABnASdVw1oMDFUTp zv+D{61p=jFv-A(X1_GsGle88ye@jA=4U1qTJQ!j^t2C^JCjl#nEg)(vf|V4DSanIZ zVQok?Ac7_ko={fgqLb`0Gnc2PPKAdxY|8wu% z{PE8(zXO;;&W|<)p$*IYGHsT3t%8vsdyqE@rXOAf-7k!n#u#;TV{6+lf6Po(fj3jk zn&h!^GPPbUTZP=50_7`uQuKUH&o>G@8Kb12y;3sGtOB1^xn&w;D37Ug!zx(Sn+nb+ zPDe`dZ)Ag#Em5){JUFMJ3q2GuF|wgTL9d2(_}J>#;75S1^BPoX4QdEV>w<<3X~i{Y z(t1ZjC(bD7TCob|>fY|Qe_2i&+j$|Xm@)DjM%m)NJ?O3OSQQ05E2nEjlKnZex+E&n zlNfQUiN8``5Oz^2L{f-Pg)}Oiw<0>;M5;cuDF-)Y@3HK01vxXvK9U?pgV)Sq|Vs1!p5$e^YZ;ugy(O?8aIA zY&?j0Eb=DmY~9kZjN1flluBlS@RDw|IW=UbAk4c|231w}IoLf7A0a_%t3|mifcs4d zlXZju*62h>w#Ii!;Zm_!&Q@mQ-*SYH8RsFL8@HmIBu&%NrH1$AySTa^0Bw|3k7txP z18u~WChZI9^zv#tf3>zc8#i8B#X@|iSgyqLR<2;G`|KIO6FNDOt?9Z)GATBUV?8BF ztWmCeuHcNFtFdBR0i9>XQqZ|xH8Nk^H%j)Q4XzjW${F*vB|74;jDEx&O%b}p`z-Yig+Fjve~XZQf4PRRK3GGa9<5X$IydI2t!9NF4C&IG7XIl z1Hxi_MOZALO;{|!BPxMQA76L* zSplBW^F2L3h2{>p^sg}ZE9N&tAH2l^-}NIbh3?Sn2&n@xvC?W{RZjFB;X!DfCiq@7 z*%7use`$7jBpsqWQI8}Me4$OYV%?KJ+BjQsZH(7`)*R$n(?mT;$lx!OM`)a(GX^}Q zN~P&@wn01f2zRiF=Xio2@D#7fI)s5Y*v4Zc)7Y|rQa0#Hi_2;&#FNpS=K051vv4FFI}0|XQR2nYxOGh?%B8|4QArDC&E zBbNaJv160#B!L2@Vv}wqQv#)8lfxxj0;OV;ASO8irDBs?CPo6KVw0mLOAV!Bq)Ou# cwn=dW001wO`zAR8Gh>rBCrtvSVv~g@U3{8WKmY&$