From 710a5def490866683d8e9d88e067c2590491ab30 Mon Sep 17 00:00:00 2001 From: SeekDaSky Date: Fri, 19 May 2017 09:35:50 +0200 Subject: [PATCH] fix --- ctrlTerm/commandTerm.jar | Bin 13121 -> 13254 bytes .../src/ControlTerminal/PlaneContainer.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ctrlTerm/commandTerm.jar b/ctrlTerm/commandTerm.jar index a4f6a3df90232c789a3c1524731fd04ec533e7e0..6e3fd5632343522086c12ea9830f24b1a903e6a0 100644 GIT binary patch delta 2493 zcmYk8XFMBPAID=vQDRd>wY4Kg!lf#xrnf~jh&?Na)tb?pnlV~?Tw>R1i{7XzqV@`+ zt*u<6_NZ0VsIB_6o)^z^-h9vJKhE#XdGVz>ce=0}q8J!?0nE(I03CfwGJ6aIBZ`uo zCHor{?^S`nNuguP`R}FRViw(b1;O6K#&AiWLb@oVN<0ZP{vz_TQMp&QT^oh6c9dcK zGoAn8pNkF*(qxlxIf1yRnA|+cR~uoA;_7O2YtFc5o>Me6)p1F@Y#$6fVPc3WKu`60 zc;Y>4;~KnLP6XEdM}nvEDFe!KNlX6dzQE>;{*&OAnuC+2pYqMDv;3#lR79ABh|Ewm zCPt&4n5L{RH&`wEJgZ*ZJ(6tAilG1ZLKV_VcopfPegU)svo5$sE&{qYfYBo=+#VBE zJ>E6xpo=DZmypHIE^@Z^__~hHvTkpUYFs9AuFNul*-J80l@u#7T({6wrmk!)Tv_Fm zgmjxo5rjFmn|0~ql!~AwGH&z}^%9)Y7YIblRI36}-QDW}jY`kiag4X02zx5)w@>$o zMP>&A5hCQ;&AUK%Q=5b}2=g%6BJ?${GBXsao-4ZdPa0;ly{oe3dq~IXuZ({A#F(Nij)tONS{#@RE_Y3*Cq=MJ~N4!B0?dA_;vPhxW`c zyNwI2FGp$~R_&}{$*>pm+Ce6* zF0X8gTVEK~vEr;2xkmhKq6=^exmtT0D zhm&AImNXLj2eCq6ll0{6KZovN15zvoVJ>+^^i+=usnTyZWiXu)@rb&1k}QD z_4*8wEhMmwZoN(S8Sr-ex4|Dk{1dD3g-bA}kAr&nR$uN!H}HaVvW$CbHQt@scKWBe zCmT1>qV0ps3#h_l80`IKAo)p>!0?(?0pO(3{tltxw>~gJ*_MBS8;R^oLeld zZe2A2hl6c_8Ivii=?8YUy0>gD^LyndoKf%GCK^B<(7vOQpRKKLD7@3V0$o_gP$M^} z2({F0)Z8fI@X(vzcLe+}NA<3Ha}nEnjWeRc;;8K~f6(YV{eof|9u#LKX*8o6_Mq>o zcc;;VMIyT@fDd8vW`6YAumen{dltQHxVj-z3sYMX?gZ$SN{d&ZJ$z@$3|MJ)v$76 z)RzX|svSo6>_egVr<l(DWcTxN1J}_$T zXMf|n-+-woTjNc9!z#_!48FXU*D=@}3J)`=3Ut%I>7a3Zqw{lcm|or4x}E>$Cb}76 z3!W{XA5X!}CKg~>XtS9`P*eHgl1vrap;TcuZAK}d1u?XVuemr7>-8;>F- zT-*`ce)0iRNT0D;+|VH~D#}#uv`-t&Q)dxB{)#z{E#FwbFns)}Uu$8vX zY!Te+ZFfb{ajy6-@ZU-}p~n?tR~tbv^*7&4`A?>`M99P+qK2po%=~L{_oA2qfN)L# z;D4g?TWRiJvtsydGNeWc$hpz1O8k3XpipI`nHYY#5NTZjc|HMGR6nP;qRu%R6z`mq z5oUT$8<-*JmkR0qFN{Xkh3Sbc{JBq?j== z_thRbLL|cQWQz1F&+GU4J>P%c-_PgueZ9Z`z8QhE06|9^;2|*p2m}Iv%WDaO8NlGu zS^`P+H)^`{cz&~vi}&F_m&b=mT)_3R+Bze_-Xp-cvRdL{s2=v)HL3HE{X(^1zc^D^ zb!F9s@)XwwmseMZkGns$`pC+H8rrNHgeNNF$_d69hzvqb2k$V(Gp5J$53c)peIey` zRv*jMud)Qh1bEt$cXA_llr(2x9(e!mhvz)k_fO-p1m2fWRdJDv<+luxD1f1zYJ;AwBHY%W2 zQg!K|&u1jhcY7*GIlVOa8qeL35*8ETc|DwH;ypr7-3)wjE zR)W}|W&FjmnNtyXl%QfrvJ4pMba5SVKGa{(aI;#>=oGfoO{!N%rTLOM-yFlw^Gs^v zY^bWQfBa|6<0MzwSU&DP+O-7TWmic~GcCmn#%87kq-H5h#|@>#dqmga;f;_`sGqb@ zz!N3ggpPuA9mVKd-RUB-x*;}i@>8pNbIu;#TQIA+Cj?!6L^(P%yHFX$GmUbeu;`?` zk8-8k1Y(;mWck3lfb z3dU8MmsU@SYPm?Nk}QLl&aqlz>cZx7L|#hQ=a!=xk~QyJ@=u6mZ}6M1z*j<#HYL zkv|X*TQ0r;+1%s}cceQyy#^1I=`7ac&Gc`7`1Ar&gmiWZDx>w7hydLQn~n9`p6NDQ4Sc zr=xJAsWoXdQyBv-*lUnt(oKU6AIK$~$2L}6I!b-Pa-9|lNJJq9eIODwJ$sJhcP#AQ z-y#Z-O+8w3`}ulgb^4YLQGYmt_GL6GG}TB3ilt?Ev1w*x8ker9)6?d#1go&Tp<5+{ zal)B%G@{j_5(LU!4)=ba8ss}9={tlAOEMAz=LbGW<3L0^X>80fSz(s}?X-66s1tHP zMx;du9^&z+W6w@FL<17EBP@#EmKGg0shFqlfd0CSDh*C|YBN$tC)##(ZSeEnp|*t} z7lgMl;G*G;MtXeV=`Ivo5>})JVxZV@u#3tdeCCHtgEz;y^>~sZEC*&E;e!`N0f&*29I??VZS|Jo)BK})QHi26CH_i%Bwv;9S*fE2 z3-(SF-mRUgv~@O0?f&3~abgkJ-LIBlwF&qWJ}jugz6 zUnq>4c z>Eli4s1S(6wVt;#SKdTtUzW4?yQF%X1$7<~R6%-@3MjC40z(A-;WH#_&MXJoljFtt zDSLz)p&4;4pM7&}g7MiTuo?3ZhH`_qMs68g736%pQPSRfK3qwY2#*4;F5uKg^sR2! z(~wVD@%qhBG&3LDdw23=*4dQCp^{Y6$)?D!+JLVS8Nsn#u+46uU1H@Hn4W zj{hMGx1LCLYonhs6b|f-X^*Qbp7R=~bk9Y~w}KtLHl|oL*PFrb{7*z7N`gYT{(OC8 z=Bx!db-*AL0B@}H?5pM-oj+#%cZ;^?5aVS#nXLijIMZ$D_H_GMAuU9i#4389W_c zk(M8QG(L=~Clixvl zoXa>C4QT!FHdXD45SpgZ&6MB!DbT8j6&;vGpvz&Q6A4_coxzCjaWO`%^mR$DX-X^% zdsq{)Ry9|Rv@lw!wyD49VzZf1!9t-3c}Hb mi(3rvPaFMKg6~zl?fs=&I}8A5{M!hqS0Q3`&hSnhZ2t=*F>s>* diff --git a/ctrlTerm/src/ControlTerminal/PlaneContainer.java b/ctrlTerm/src/ControlTerminal/PlaneContainer.java index ba82d67..60bb4a3 100644 --- a/ctrlTerm/src/ControlTerminal/PlaneContainer.java +++ b/ctrlTerm/src/ControlTerminal/PlaneContainer.java @@ -47,11 +47,21 @@ 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((this.expectedFlags&(byte)0x02) == 2 && (flag&(byte)0x02) != 2){ + System.out.println("\033[5;37;41m Could not apply cap \033[0m"); + } + if((this.expectedFlags&(byte)0x04) == 4 && (flag&(byte)0x04) != 4){ + System.out.println("\033[5;37;41m Could not apply speed \033[0m"); + } + if((this.expectedFlags&(byte)0x08) == 8 && (flag&(byte)0x08) != 8){ + System.out.println("\033[5;37;41m Could not apply alt \033[0m"); + } + System.out.println("\033[5;37;41m One or more fields could not be updated \033[0m"); if((flag&(byte)0x10) == 1){ System.out.println("\033[5;37;41m Plane crashed gracefully \033[0m"); } try { + this.expectedFlags = 0x01; Thread.sleep(2000); } catch (InterruptedException e) { // TODO Auto-generated catch block