From 60b0624f04b9f22381c14cbbbd7318f0d88eb9af Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 30 Dec 2017 12:54:52 -0500 Subject: [PATCH] A3XX: Fix ESS bus logic wrong, and ESS switch wrong label (thanks merspieler) --- Models/Instruments/OHpanel/OHpanel.xml | 24 ++--- .../Instruments/OHpanel/res/buttons-grid.png | Bin 817 -> 0 bytes .../Instruments/OHpanel/res/buttons2-grid.png | Bin 6180 -> 0 bytes .../Instruments/OHpanel/res/buttons3-grid.png | Bin 6308 -> 0 bytes .../Instruments/OHpanel/res/buttons4-grid.png | Bin 6402 -> 0 bytes .../Instruments/OHpanel/res/buttons5-grid.png | Bin 7646 -> 0 bytes .../Instruments/OHpanel/res/buttons6-grid.png | Bin 9161 -> 0 bytes .../Instruments/OHpanel/res/buttons7-grid.png | Bin 7357 -> 0 bytes Models/Instruments/OHpanel/res/buttons7.png | Bin 7335 -> 7302 bytes Models/Instruments/OHpanel/res/ohpanel.ac | 4 +- Nasal/electrical.nas | 92 ++++-------------- revision.txt | 2 +- 12 files changed, 33 insertions(+), 89 deletions(-) delete mode 100644 Models/Instruments/OHpanel/res/buttons-grid.png delete mode 100644 Models/Instruments/OHpanel/res/buttons2-grid.png delete mode 100644 Models/Instruments/OHpanel/res/buttons3-grid.png delete mode 100644 Models/Instruments/OHpanel/res/buttons4-grid.png delete mode 100644 Models/Instruments/OHpanel/res/buttons5-grid.png delete mode 100644 Models/Instruments/OHpanel/res/buttons6-grid.png delete mode 100644 Models/Instruments/OHpanel/res/buttons7-grid.png diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 486db82c..7082233d 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -16,7 +16,7 @@ select ACESSFeedBtn1F - ACESSFeedBtn2O + ACESSFeedBtn2A ACPack1Btn1F ACPack1Btn2O ACPack2Btn1F @@ -2939,11 +2939,11 @@ - AC ESS pick + AC ESS FEED pick pick ACESSFeedBtn ACESSFeedBtn1F - ACESSFeedBtn2O + ACESSFeedBtn2A false @@ -2979,16 +2979,10 @@ ACESSFeedBtn1F - - - systems/electrical/ac-ess-feed-fault - 1 - - - controls/electrical/switches/ac-ess-feed - 1 - - + + systems/electrical/ac-ess-feed-fault + 1 + controls/switches/annun-test 1 @@ -2999,12 +2993,12 @@ select - ACESSFeedBtn2O + ACESSFeedBtn2A controls/electrical/switches/ac-ess-feed - 0 + 1 controls/switches/annun-test diff --git a/Models/Instruments/OHpanel/res/buttons-grid.png b/Models/Instruments/OHpanel/res/buttons-grid.png deleted file mode 100644 index a25f1b0e04d13e536a114023a0a1e6c721c22b3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 817 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*&nj7F$fsmvhMr<6q3yhi70W-&&^HED*1ZVvs*Y@>?MOwPP%d2 zb6wMfh_#igUZt&k=Qrt$&xilgf9Ei|fSk#~Ai&^2B?h@BJ;*+9`Mip414BbD_kvZ| z^cp~p?D78aUyMP4p#kVQ1`aAQsAm$yMGXuUOyv3+XQ&esCI8MApW8W)QHLSnHq(k# wTe%nPo~&a0Sm@7wR;q;+%!gzLf6XJ-s?Abut{JwWz=X@->FVdQ&MBb@04>gYx&QzG diff --git a/Models/Instruments/OHpanel/res/buttons2-grid.png b/Models/Instruments/OHpanel/res/buttons2-grid.png deleted file mode 100644 index e36a4db42d9d14b9398fe9de0a373af15e04da46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6180 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 DI+>W? diff --git a/Models/Instruments/OHpanel/res/buttons3-grid.png b/Models/Instruments/OHpanel/res/buttons3-grid.png deleted file mode 100644 index 7d9f83ac75406e956674ad37f7d2551a2456adc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6308 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ⅆy1|Aj{A;Z@q;%q@N^oHL>M76sl3rrMG0Cu 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 K)iPyJ%zpt{V6}Y! diff --git a/Models/Instruments/OHpanel/res/buttons6-grid.png b/Models/Instruments/OHpanel/res/buttons6-grid.png deleted file mode 100644 index 6b66b739ed477691856744b699a705c8d680b7d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9161 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 UeRlTw{4JuIvbItg%p&|h0CGtJB>(^b diff --git a/Models/Instruments/OHpanel/res/buttons7.png b/Models/Instruments/OHpanel/res/buttons7.png index 9b4690f41d8676e6beee67f625b0036d80929abf..955d260901c4709cea2fa828a73af13d98c0a202 100644 GIT binary patch literal 7302 zcmchccT`hPyYDweib$~_O+Z8e=_pM)C?LIqbVTV@x|Aex^4W(3_>jpAW>WfT z=%`Z8U*NbXDhdm?y8~viyBI(6yYJ=U;o#{9-U7gVABV?&4o|NKy7)O?SJ%+de=6)i z2>@*C8V{6>gC@7K0z_+Kiuw(u-&|i;2z~m zzN;^(;ZzDL>QuLkZ<82PvFB;g>KKNPpu?c#j)58~0ZHh-UhEM>A+%1)cYCu}KCu4; zJAFICqHHXjVc`wmFY*_I02P-wph86pV^ATx{{MVyC@8J*e35)@u)KjH%cff`UWqnT z-fxFL=l;(pB!NcfPM)d8rQOy2^<0;lojhqQ{SI&K;M5}VrzgSV z7e;;$uUMFxmfbh6rSm_j2|_qr)txn*OQPl9tY2%-{jLiq(#erC5A$5!h(RphhS-ek zk1rrEx-gH*B)yy@8JP{|hPC$H70b1ZPSfilPdS-?wPvI%9jG3jCryA@;Q&iYa;4?z?MX!P@IuHL0>SA1?14v9y5-|dptKRU>P z{n9$$ZsYT9T3-0k#gynt;ytJMbo3pDkS^*}>@L1w8njG-oQl3nsf%|d4D%5-`23bn z+^OLBWk#xWOHwmpUpp^3d&tOnv%I{F00*gi)-7v{ z<@U`X1oy)Rx1#b_V4a>oPHpx4r(TWIqeN2Z$&;D2r4|R?Yt0|3Wra22MrH2B0^EhD zNH(QvO;)j{{WRa4vC8joo9b@Xe-*&y-w(WX>sBe_?uXl0L!)6n5qKv0cj@PLZs(tB z9*vUc=x>OYu3A^kRea0{mNHWwmP@fnUIgG_9k1^HhJJF_m1YWj|B=hCCmuBwEsElte&idO+ItiXjfU$a#c1;TyVrs2Y+22{U_d zY^Da*Bn1Oq=SQ&pTpyW)vqjfe-N8~H$q%Oe>BoH|fSA*fdtK(=jzT6e{t7Y_nT#M} zyaOdX1lO>|Z6^?nJp?VrJFVqF#m9TrQ2@{z`>b`5m)^%jsHANykTdtw`0n;v@mjuW zZ(3)eg(RX{uA97hy5LjQofl{JT75-4I8~yUI-O{U{0oyFh=dlOf@@aC-b; zqjYs_*fo5ImS2!C997)S3_8Tc7NZrczj7j#RA!UM8Kc0U#Ex9hDNJ!>ScCE^9x6NYJjdE|9=rv{jMJj!jNuVe)8{eY` zRW38#5Ue!75{#ZQ7I(k?O85CaUtpIzCoUC1G_9w4_*-aT;Ya#fS&DjwA@pd?E1613 z(}^eKe({zzVR@oIlj3H3_*qAQ3!U^0-40yaz>Mh6_HDWVh&8(SNzTc-T*$dbz9poP zfRj?nBGLF%#ehjM&QHr$VW&^IeJ6Jk;+UZysVp zkeQMJrZ;tA*R^AG5!Dz;#w#jUd8V(BlW;u=uRIxKNt@v8VEVW(gm zdxDTz@yjFPO!eD_pO@Lj2(L1vgt@u7X<1lY>Ygv&kt{uCDH4zugYR9dJV_BS8ETxR zYLq=Tg1TV5e91&F?7l!DNPu--ozEqr`bEa}8KPRfs4Wz5akoGPF}h-@ju^FXrBB-F zr=jUUby;pyPETevnrlsMvw4fQRN{DfM97b$3g$pzk*f})dpMkpM*9l73RFujp z5!A|FtDs6twUag+9USdo15)v zi&<%N9=TOa;1aKmjhp)oL(0kYp%{$UU9v)h>ShCCd*yw#qg?fUmSx*gg8^X~Lb8BU zU%Btm0?RM95!(;=sb1iM2zHO}p3s3RLl#}wG|nluAHDfR_wcc1)r7yHQPO5VP>2%8 zA>&A-8w(kpdlaV4UTTsX@X5$Mc3F*Xc$NF9=MEO<5k<@GqnrH_W1#lc-XS%DW zw+`K$4U|!(WyDu9%7W#uhn=_T)A0IwxZum#EFEN&z3;+I z*Ip_d#G9GQ#)S=k&J@9KRuo60hqTN|K2=sC+$uqha>IO<1?*Qx zyQ7L5mo-feQ)u`;XHK>m8J4qNW#B4clW=(w5Y|?dt-Q?rG;9YP{S7aFvbAXk_~?dN z(I3NbhhozTp#m)#Cv*SoMD_`hg4|0A;v1Wbo16B26`|AfO;wV>x`+p%%oT{ZZfDZn zY2W;F;(FeLdZxpQpR>yLS))bs4CGwn4eF-mHwq%P>z*x*>Na)kDV^qMC?7Pks%d+0b!?wI&-bA)kw~;)L@;j9jujLL-U{)xH zhr=uEJA`_v_LFA$jIzl>Rvk$da)Ll66Z%^C#av!x{iWII2$i!W3;OV4UKa3LjoXq8 zPW(AOTTC%n9}f{mrUplw`_tNnXO3s?RQCrdc#}mZevIu7mze+L6Q#Kv-NIih>eKu5 z#M-6FU;;(_<$&u)@w+Na8h;gDN#zX%{AX|aZHbXHl9HbNAikRsObyj`G87*3JbwO- z(*Ee<=z!f;@x%0((-GTsyyaHyoNF!bi+(%>UnN2kJKgO02Y+%RF#mWX$=;^%Hb8Im z+N-$Gw22NYDQ7npfdAeU5znN{=rXI_(bmS6A3}J2oQUqlH?7ZT)O{`$HZ;5>^hIba z8sB3CEl~xOxx(80E~8`}fiW{Z4q?y|65&^t%W; zZVw%o8gOl@#O*IxD14dW@cY4FZMtnepF<`e%6&DsyceAeOnN?tf^!GuhW$WKI7l_J9;9!vYk zgpLk-JDNFnM}gu+yE9*^AYQ!-1dw*h9~PlPamZh1|EDNT`|$r4nQxrS6m0tT{H>)v z>ao_B(&R_ixX^*5pvf4oq11?IS{n7W4YI;_j4p$Gt5F%93--5=9wW98yk#%&Ejo(Z zU3!*gyO2kTuv~=dm^mLRDy(XnQ#}1+18^G}w7xT?epX;2OllY^P~)-$HuKH@T~Pd; zJL)!~8k2w?s&lb?e|v+To?hf8FYf}e$x`}cm1A?d`6`o0W;c>3B0vYXsFeX=x3f`^ z9+svbaK{z?EU|jLeUyMzV*m#sM7-bkmBYgTQ=Xs0!``Pv53A-NijV-W_U%R~CB*0l zImeKfYPrg$jxvVtEeLSK?6keRageNe>%Hf#`E}Dv4m~DH=-|E~#OcH7 zItaBdig4lhz_YT4EE}(-2hE@*;U_1zpBItcy`m^0Lvhgl?N*~c*LBhHDzN=3Nm;aj z^K_li*U;{?uk86f@6`zu_mIV|5)-j_T<5p!u42@y`imKG(-4ci*QETW9jUXWEps`S zH?eaF;?I#;o{O;RYMSOlne)p8eoR*2tf{*dirh(;Q%%$7(zJZjj^Wn#waF(`HZCj| z01!7`i8LpCdqYz8COP@`n9jqxn6{V$xcP2^zRbP(QMk<`#@ZI~19}Wuz9BUr?f*v) zB$pm!>AZOSbt-QGgY%=dp)5IBvr3?s!S(s{XSUB>2=cuK$&|`(nT0ecC^Ntf>szM~ zf}|y5D)A|;RMZ%nWJ_wG<@4L@wvG} znz(CY+m4-j+5Q5WGxU`EcWYQX79Byo82se>$k3p(H~<5m7F)_n^eOY*DBu%AcU{jD zplYi+K2XcB(nAc-|IRhOrWg#|El5y%5kBWJiSjfJS@V<0Lnx}9l$FGy8_!h}W$EM_ z##)ECk2~%}QlJt))Uy7HA^}75Iv9Yw4eCERZRgk%JCBSi{e4G#H{2&bUx>e|&9o~Y z9Mw9Z>R{}+y*(7PC(Q`x=bDlkhvry>PhEPHf3?`Sgcb-o!0 zz=;U}YmAYatl4s}k-N*yj@q6~TaC&JMW5C}@N_k9+;{H&q-nBsaY@`upzE=!A9WT_ z6LS#fDBvLhicLx)@voN%&O*4- z~FA_ic`$>TsXU2$2w=^;L)dNMuy@oC-^^>v7 zBFn^%4lKp}m`?p^%Ho!mC;^zGkWB{+`Q5Ut4_s9)4oj8WzN-c2!Cw%Q4qQn~>v!W{ zeLhk)Yo(p75O#Ccr%Qu=r?WK+0L;v!YPJSVtj4$sDKj&z0U(AB`@qLXC1-ze25p(9 z;BvD@ub@)x)d%N&Vwz^p7?(Z%url&Lfz1=(y%2DH4@bh2NPSLOX?2`(o$Us;#kYrT z#@dmYf`Tm?n(<(w9%!jb7$U+g2RP2cSJRI(A< zNxUT*_&Ln^guqIWALstAeW!shi789v`0?RdoIPZ#SoKGDZ;)r!=BD80Y+QJRHAwi4r6Foy%jl<%u{_pg@ z3Q^NJXG6`SM<)C-^Y+Zh{L<2^xZxYWN0B9iRsK|RO`&jO{&~!Dq?v{Px6*q8V$UpY zf)j)UNEP|m`cAc48=u7-d4!%D$KR07t57~q0fmez4~X1cklrvUT+DaPnQ~vM4fj+09Z_s2D2R8zuZG;&GFsW z!)3%oY?@T(7*vJd+ke+SZ$Sovnwqdt6y!W-Oa=x?;pe~KM%em|!ZLDo1>$%f6K7$dr^Cu(a zJO)Ds#1cJjJLFDh6H)2~_9C{!pm4xpRA*J`#)GpptNLJVzc95~4)*1RfR zl%a;~XyXDc0KUBs3k!^+@0cStF>E1E}^24wX?=c>2K$<$?PNxOO_QMx6OSPgb%hHK464~NMA z`o*vDaQg50KlqK4*`Bl839&Y4IUfHl=vGyF=@ljUIy0{0;vZ+DbrDWN*(H*PnBJ#e z4{NiEP;yi0!>||9qTo1OV@52@z??)l(%B}jNZjn+IG~B2-(Ibq8BpYS1x`e1^_h&Xr%~kUT0QXDxSv&pi9HR)zA(Wh? z%+b$>d0qoR=)JH~>*#QLqom5s)O+@j7R$wXEVg4O8!uZx5)>44hPd{Sg9ID^W1kv- z3EkLn4Ft2Nba)@thmv5?iIl*5!;rbY&-Cp3XXpVo`~rN~jnKYVK-=@??OWfsOCUJ8 z&o&rZT?HA~Q%1?ukphA@fC@Mb%xuF;D^T}Y0bFVVvBMr%R5(=8_DUd*I-BoNgh5VX zY$r`R6KCo!jF;O0K%sGYkW)K?&gCBoY8r4IDfN1<_-yly0dehZnA#DO+emc=9emjJ zqL|mq*7VPc{FKdW`ez%a6r!XQ&=xQImZo6Y^JW&EqU!npLssJixJmwq9+LK57X_3+ zf;e33qH_Riw>Z;XGOdl*hC==i-NQ-T)F&XIvP4&O`#8?N!GCI8|9F{)?io07KC@aVlJc4=WmN4OE>(&F!kJQ5y+(EhA_Ki_)qvS$u8tmAEuT_H=U=0LDM+%FUOTh(7Dy0-~fC zpvNZ09^l(H>ssTlZ&Lb;-521#Oav?J zr&t!pQHjvY#Z7(GWJ-n$WDkT0%Dwb-8Gsb>UBFeM5wz%xi1kb4hs5d-X#-wZDa9|I z373W|C~zvbYh%#<5rwu;CHrq-04z0-<*S%;DSDIbU(D$w;yzs;hAzc}iU8|!r0m3O zR8>ul`r-2-L9tn{LFUE@slPM@>6nj9bd1Na7||Tucp-vF>`>1R%dT!tM17werP&p9 z!qRZ$?^X5T+^*)%!VJ!~FYj)R1Ps>~oslRe3zi`%C}7+~yOG*5Gvr)#Q4HE(z0HkF z{Rk>KzSVr@ekia=v%Kjgn$#ydy>R&iGoLE0NsD$S>S&A1%m zpOIO6itACjbD-`F&c#2Yv-bA^mDrOx@$3K1iCRF*Daj|1XeJw(sN%EZKn+#h2jwbu G5&r>XH*m4y7vT-qEtmhT2K^GniK&+x&opUk=_C*NDW8}(n3=@h>C!8P^y3+(gFme zN|%I=R1+Zd4uOO_{Leb;-Vg73Kb(8lN-}%)p0)SR%=0|IGLgF4>I`Q&&H@0y@KEEv z9soeVCIq0R1`p=$1$N+p+UAk^eEnJ83*0 zYCWKtrRQPcV=18#BZFPs4*JHPs;(|Bws24I6aZA+ZLK|RpYtLdJnebaA8P477qO)Q z0IqWn?yD;G+cZYDN&JDFmHqbal4o?1c6$>maM&vJ!a5NA>cSuJ+E2JSrpy;PpTuoX2jj zN3BIEAlNqX4z>O;`@n78_>pn^+^E5sDYN4CK8agAceE*X5wlmCY8dYtONf8h-8`48 z{FVnD)76^1cUK=vmqixgg3vpqhnh50wE5dHemg)&w?YkO|9YJn6hCv|!=YOi#Usyw zw>C~S_bC8gQydf^q}Fg0(fhS>lB~}(bil1hWf?w@&(UgCbbk;W9DVQQ_1=5Bhx>6s zt>4dH%P_E>(nbhH_uLQ7I{yB^v&6#P2HqTHp2@_+B}MX+nSJC}&h(YL`9I0$4pH-^RCPoBxpm?pL{tr= zvMBokrkJrd(VkmSi}0hU@ZST;+J{^<1wy}N-#sSWIcq~JaH9Y@#+zaSoSbbh`vB8m z(X3>|_y*#lPYAVN5FQt$d!H5W)`){k^8rwuT&ty&>&t)x|E_=cWgq=tw1o9JY9-p2 zvsaW%^8lTF|B<~t$(d=n;mk9S`>z)6N0s%p0eAYfKqN1?bE? zxz1OBj^=Fo{d_)8ve>fXW?CNqZk+k-qMEiY@{)8=zzKW48&OhZOp7akbAe+7VfoO@ zmTDLAl2SvaRAnuI(v>?$wVPwuE5z{5_CSRldD1nGQA4KrMGNkqt7<-$Hr4T|{br-@ z3P}pLeWonRMA^ubd>wBD)tk-xcqJjH;>(Z-_PLvwW$6O$|kwuA(?&AKd?AmWCveu@Zi4RpC?lc$zyz+XV1)JQ>gvu zZ!6fVjsKcILixmL=wOoxQFQBB0s5Rez?59w%^hHK@8#Sl+f>9>9R=7fw~}r{Q2%Rq z^rh)*sZ4=Q=Z51EmFlnAszFJRDI9%gC#xHuY7;qH^IBRb@=oPc6Q^Pt9buiFDpsu} zpPzP?`G1$%|4~_pSF>Hd=pC>uNq$`V^W%>TB+1{#tenDQtGVQ@!Rb5}rN0pZQLZlx z?Q@y$Ue$azp+>^xqxDJ*b$%os2v$DP?}VgvI)q7 zM?lpuyJ%8i1?Z00e%G`21o?{KniL(xI=v?p6|1HgdvE*$v0EL9x)12dO5Ektb9q4! z?f1q@@?H_42g@7>aHaL)lf)q=MgJC!=%(e-JqHU^-0P^K?Tw2ogSyzNgCm-(NA^%E z>6KX5_$qNTsru%?Yfy{eRWn1r>$to}p7#i%45aRB6tqQ#-fcY@T;4}#B=36 z1}?Ae$4tDzeg7m|FI<3jT3X+r&9W^Pv8mJgQ9PPjb6J6Bti3$zm;2rApFs(uK8;n$ z(7)0&<2VIl6w%MT)}L`~ETyxruQjoI;hXpF{(#7S^GuXS+ZJd4h#ERLH*IZ2hxFwO zx`m-hvgZOh0|MBmN&PDPsq{rJviGO6*oo!5vr~M4AXyj! zRV~z)bve)>bz36CIfB4@Vh3Hjjz>6KPy(ZMwuuMTI%IId0_+LN)0zSQgJ7;mHk4bSmy z$g;hjPO1LJR#jbGQc~GdFLCf<61V#etJnF{G$McVN77#%CosWQ8f+dPNyk#0H)KU$ zxF!7;hf^R5>8rhX|Mo3Wqt4~e>#R>dGMbiXCQ1gnPk6J)?}nz=SdOxv|1VVUc7Ge->{;?Ob zJ0rGl?ZINvs%^4hHDIR7ZmLrsF%`;F6|Q;tcMMKy-Fce@T^%n#ua4V)LdQ>%JYwkTO;diLvrq;_2%E%xX*ofDCzL`RX+8l1L3EpRcj%l zI*kH&#QLPwh}zK77PAODY_@)*OCW|r?o3F|BA$))EZA&YX^+<>U0d{&9peCYlN!n1 zcY@aBV?1g_?d?nqMs_ZCzV4+{T#3n78MgU5`m5mb7S-esk8ZI%i(avUT6}60+Ucv9 z;L*bR#Ol-`GVX|jy9joE`_a>>5IZFf-@VImj?GuxjQpA`R)fLT;@ArrNy@=*k~raV z|LMApa>9afO85yDMj%eC{+Qv2WeQtsrxvLG4k?A9o^KK$y}3@4X>* zKSiP*0NJyoHczk~8b&e!zl=n)^5S23Iwa@%*AVwRr52G8HU8YR5^b5)as z!<2f91zj8$@TQQ9K&uGGOMM}4{hqeN1i2Hk`jiy4B-z^3Fj)o2LfxVvLSfZt7Kk_O zgVZt!m^ebsXtNFpSB&nZ4@z(HI<4Cdh>Be zyL5vH8Ey0VNLz^@sz`Dn>J4Bo*-ZXycCaRLx}3G_tgVxn2?H1T?ip=ie^S z*;eT=&ijkQ^9l-HsD@j#)Jk-edvwSi*F6)a_ibo9Q+YG9RuYy%FA=#?6XTDLt9Qb(&^UBvgL zgke7*&wbD`M$>yub*=+ox&OL$`rGO`*XPsC(bda+adPsB@_g*4E4u@CzKUvRDufhN zQ_q`jJtz)@73!-jnegyr;GWcK-jVdJyF+B+i0w}5vjKx~rrLrteXA+|6dbWlp8a$ZiKddeyc)f}^ zT1tJF`HP_N`jyyn_V0ty&#@uJBkdiT!Y$v7ZruF?hS`@wwCYtrS{mWMhG!UU-Sl_G2RBzCG+QD9MQ|OI6R7#jsLRGMqfxIO3G#rc_T}w|BZ~#jC6U=fVJyfBvC8vCs2U) zJcXc|V)=pU>0%plYFYj>%$pkZVH31B9h*qoR zgabO#aK1e0uP3l_3_sJr^6n@z8e5aW-_I)W-m2oBQ2jLD$PHQwl@?3pZBA(+;i15x z!U^5SusXM4yH&5FJqG8A3e%qI^#P0FQ)*d){=?AZ$>nh{V_8h#k+t`q+yo=+tdL^z z4kw5$LYB835A?gQjttd2G}ABDV*uP%$FFnA>TapuOw_!t)}S!tBQ;h#mFH5mJaVAE zRt?Il!QtsO>KP+3rN^*?h0g|FqQ@SZkB z=p@=IH1)==R}KK+mS~&Ji}sIdJ%9VC(G?j!{r4X8AzBL>>-G{~i~MfzSv>Z0@INQ~ z-JwOVey7U}2G(}!` zSmU|*xG+%ShBT*OQpem-lH4pI5vf#wHZMm(>?Hh!7xKgOpZCC3$C87miavr=!|Q+K&>wXmbB`v);aQq<#G^LH;<1kPQGg^xwD^Nt`?i(yh}FL zoYAYeQ&HLD6>A=*xQtzAg51^bd7^4`wwdbbECxP#ZxyoVS0|Ox(BOYr|`kvG&`|4HgXya;@93)>XbnuXMco2V{j>4^NI zTsAV_f`F-+j;|i2mk5JY&(wEef3HQ|<6{nnv|*5x6kdjJWU5s?%{A2wYIAl@;VEpk zUaj?3jIsaLVZZ%^0+&J~S@%}r#^!E^#A==O-Xt#h9v|DSL{4C4GG*Sl-mU5Z`n{Dn znsaXw2z$+Ro9<-Jxk?d~cF)@XCd~P4v}Mo#u2Ky%SU%;Ox?eaIZFIxpIO3p)p^JiblWAO~#s}(w8+xfF)Ek^)wQBvVxedW3v z3fWeB&HP}2b;`fNHDRv%GC@>})cv=G*K7HX%E&;Y{ZtMms9r;ol9(#TJtyl^Vm?!% z%Aa*RrpaXJ=d9Aw7X>FS$0d_iU-RggOeTEw8U-KuT!*dS?EE|v5OIQ2zu(Wk-zgDf zS*EV7Emb)#Iaw2UCSRMUy_9=XL-yN5QPShC-4e3#Ai!>YaQxw0BrLV4t4B67OqFy}_cC9Z$tQ0OP1{j7Y0uQ10%sXniW6MzFHJs# z?v%gU17WA$#J^VkKRtDh>>3tKgQ8esQ>$#d$LVe&Ip6+6B?Gx6-S4wr&44<4$%i)U zE}j6qv=j!?v(4esQ2&Uhn!3otC07Z`Z+k}@)S(dYBb&|$!nxh&LeL*zW@pL+)vP(erc_5+W=vL-K&tQyy>E$Kf0d8 zikTL5Zh$t*(Svztr=dlwOiKI#xG+F?maqAf_m`X}lc zP^0x(_(dLan~eZK72M=HxupAh!>JV{nQnDBc&6r+;AKD;WU)zCr@hBc_n>|vE*1pu zXJExFkBBIHdy^l$^F#a?t#GKV5fZWq!gvNvraAlX$8H+-HIgh@PL_}l14|9ZPz(3;9Dl!MtQrT<^sw}tyxW+eZ%7GCjIY*B#&OY z^+}d^PzO>1A3y>Tmrl?-fjK?V6yQraeT5N8UAgT)lq4#c^-w z=XFLsZup*h-fX4!sbnTbDtI(a@?b)70r z)+5_wYLG@OkAz^U;{WPar2TECxX^yAPLTENnGEkOizZ25d#DgZ-Le!7FI`; zYyE$@7U^p<#`X46Yf~5s;8Yo)G}nZ5kxPViX3E8>7MUc}ZM%;KURu*(1ZR(*z}t_$ zoG%pvuj9iXXouv#cy;64Ng-PQlo8uYDlBpg8}(eevv0mQ#(}Ow)oOKpc zbX%0kACvxvod&kemLTvEOD32{dsoBaU&M9DLH$$EjR?iIqKngPrhVg=?rARBraBpl z{A_A|cB)@+-41Da9$>&MuMfyUM#?Poa(taeghV8)AD3xPTu2vT5`*=JNr3Q~kG5cF z!X{`<@97PGS9+LkDdMbU9E{12m+2*gw_>?pC-iRCwi$*;*bLD&`KmaY-r&&THo>*q z+c0=k*i(oOxiZmC89|g=xC6@E%B)kj;G1v)U(RTS$Yd!Nrm*S=rDVU{rfo&D$*11c z3I@INPW70Ok_lpfCNn{tot~LW`4}4XRN)0$fS)7UCf7k1i`Ewya@^H7a~{b4d>>GH zZ@1d@S(!>%U<=w-tq5vs;zSSdd4SFwa`V)aY6NkDR*5zNnnr!?|6k%;=?)YR$*IU* T6JFQT_k|B1Xx}eYu?qPwHpdd& diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index 426c26fe..dcc69378 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -36994,11 +36994,11 @@ refs 4 2 9.31321e-008 0.5 kids 0 OBJECT poly -name "ACESSFeedBtn2O" +name "ACESSFeedBtn2A" loc 0.000175806 0.0480501 -0.11075 data 8 Cube.062 -texture "buttons2.png" +texture "buttons7.png" crease 30.000000 numvert 8 -0.01 -0.0464 0.0314 diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index 56a14623..02d49d7c 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -145,7 +145,7 @@ var ELEC = { setprop("/controls/electrical/switches/gen-apu", 1); setprop("/controls/electrical/switches/gen-ext", 0); setprop("/controls/electrical/switches/apu-ext-crosstie", 1); - setprop("/controls/electrical/switches/ac-ess-feed", 1); + setprop("/controls/electrical/switches/ac-ess-feed", 0); setprop("/controls/electrical/switches/battery1", 0); setprop("/controls/electrical/switches/battery2", 0); setprop("/systems/electrical/battery1-volts", 25.9); @@ -419,117 +419,71 @@ var ELEC = { # Left AC bus yes? if (stateL == 3 and gen1_sw and !gen1_fail) { setprop("/systems/electrical/bus/ac1", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac1_src = "GEN"; } else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) { setprop("/systems/electrical/bus/ac1", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac1_src = "EXT"; } else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) { setprop("/systems/electrical/bus/ac1", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac1_src = "APU"; } else if (apu_ext_crosstie_sw == 1 and xtieL) { setprop("/systems/electrical/bus/ac1", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac1_src = "XTIE"; } else if (emergen) { setprop("/systems/electrical/bus/ac1", 0); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac1_src = "ESSRAT"; } else if (dcbat and ias >= 50) { setprop("/systems/electrical/bus/ac1", 0); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac1_src = "ESSBAT"; } else { setprop("/systems/electrical/bus/ac1", 0); - if (getprop("/systems/electrical/bus/ac2") == 0) { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac1_src = "XX"; } # Right AC bus yes? if (stateR == 3 and gen2_sw and !gen2_fail) { setprop("/systems/electrical/bus/ac2", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac2_src = "GEN"; } else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) { setprop("/systems/electrical/bus/ac2", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac2_src = "EXT"; } else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) { setprop("/systems/electrical/bus/ac2", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac2_src = "APU"; } else if (apu_ext_crosstie_sw == 1 and xtieR) { setprop("/systems/electrical/bus/ac2", ac_volt_std); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac2_src = "XTIE"; } else if (emergen) { setprop("/systems/electrical/bus/ac2", 0); - if (!ac_ess_fail) { - setprop("/systems/electrical/bus/ac-ess", ac_volt_std); - } else { - setprop("/systems/electrical/bus/ac-ess", 0); - } ac2_src = "ESSRAT"; } else if (dcbat and ias >= 50) { setprop("/systems/electrical/bus/ac2", 0); - if (!ac_ess_fail) { + ac2_src = "ESSBAT"; + } else { + setprop("/systems/electrical/bus/ac2", 0); + ac2_src = "XX"; + } + + ac1 = getprop("/systems/electrical/bus/ac1"); + ac2 = getprop("/systems/electrical/bus/ac2"); + + # AC ESS bus yes? + if (!ac_ess_fail) { + if (ac1 >= 110 and !ac_ess_feed_sw) { + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + } else if (ac2 >= 110 and ac_ess_feed_sw) { + setprop("/systems/electrical/bus/ac-ess", ac_volt_std); + } else if (emergen or (dcbat and ias >= 50)) { setprop("/systems/electrical/bus/ac-ess", ac_volt_std); } else { setprop("/systems/electrical/bus/ac-ess", 0); } - ac2_src = "ESSBAT"; } else { - setprop("/systems/electrical/bus/ac2", 0); - if (getprop("/systems/electrical/bus/ac1") == 0) { - setprop("/systems/electrical/bus/ac-ess", 0); - } - ac2_src = "XX"; + setprop("/systems/electrical/bus/ac-ess", 0); } + ac_ess = getprop("/systems/electrical/bus/ac-ess"); + # HZ/Volts yes? if (stateL == 3 and gen1_sw and !gen1_fail) { setprop("/systems/electrical/extra/gen1-volts", ac_volt_std); @@ -563,10 +517,6 @@ var ELEC = { setprop("/systems/electrical/extra/apu-hz", 0); } - ac1 = getprop("/systems/electrical/bus/ac1"); - ac2 = getprop("/systems/electrical/bus/ac2"); - ac_ess = getprop("/systems/electrical/bus/ac-ess"); - if (ac1 == 0 and ac2 == 0 and emergen == 0) { setprop("/systems/electrical/bus/ac-ess-shed", 0); } else { @@ -738,7 +688,7 @@ var ELEC = { setprop("/systems/electrical/gen1-fault", 0); } - if (ac_ess_fail and ac_ess_feed_sw) { + if (ac_ess_fail) { setprop("/systems/electrical/ac-ess-feed-fault", 1); } else { setprop("/systems/electrical/ac-ess-feed-fault", 0); diff --git a/revision.txt b/revision.txt index bbc24e95..7b509411 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4210 \ No newline at end of file +4211 \ No newline at end of file