From f94df5e467538c58d23769bf3be08c0dadae1188 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Fri, 7 Jul 2017 15:32:39 +0100 Subject: [PATCH] huge update with cargo smoke, hydraulics update with new hand pump, and huge icing update --- A320-main.xml | 1 - AircraftConfig/acconfig.nas | 2 +- AircraftConfig/main.xml | 37 +++- Models/Instruments/OHpanel/OHpanel.xml | 51 ++++-- .../OHpanel/res/buttonsCargoSmoke-grid.png | Bin 0 -> 8668 bytes .../OHpanel/res/buttonsCargoSmoke.png | Bin 0 -> 7463 bytes Nasal/PitotIcing.nas | 35 ---- Nasal/fire.nas | 172 ++++++++++++++++++ Nasal/hydraulics.nas | 11 +- Nasal/icing.nas | 171 +++++++++++------ Nasal/libraries.nas | 1 - Systems/libraries.xml | 21 +++ 12 files changed, 396 insertions(+), 106 deletions(-) create mode 100644 Models/Instruments/OHpanel/res/buttonsCargoSmoke-grid.png create mode 100644 Models/Instruments/OHpanel/res/buttonsCargoSmoke.png delete mode 100644 Nasal/PitotIcing.nas create mode 100644 Nasal/fire.nas diff --git a/A320-main.xml b/A320-main.xml index e7a4431f..850b3195 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -977,7 +977,6 @@ Aircraft/A320Family/Nasal/icing.nas - Aircraft/A320Family/Nasal/PitotIcing.nas diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index e26f5a49..7e8e5676 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -103,7 +103,7 @@ var systemsReset = func { fmgc.FMGCinit(); mcdu1.MCDU_reset(); mcdu2.MCDU_reset(); - icing.PitotIcingReset(); + icing.icingInit(); fmgc.APinit(); setprop("/it-autoflight/input/fd1", 1); setprop("/it-autoflight/input/fd2", 1); diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml index 0e224d46..44baae18 100644 --- a/AircraftConfig/main.xml +++ b/AircraftConfig/main.xml @@ -12,7 +12,7 @@ hbox left - + + false + + property-assign + /controls/fire/cargo/test + 1 + + + + Green Eng Pump pick @@ -4655,7 +4670,7 @@ property-toggle - /controls/deice/lengine + /controls/switches/leng nasal @@ -4668,10 +4683,16 @@ select Eng1AntiIceBtn1F - - /controls/switches/annun-test - 1 - + + + /controls/switches/lengfault + 1 + + + /controls/switches/annun-test + 1 + + @@ -4681,7 +4702,7 @@ - /controls/deice/lengine + /controls/switches/leng 1 @@ -4716,7 +4737,7 @@ property-toggle - /controls/deice/rengine + /controls/switches/reng nasal @@ -4729,10 +4750,16 @@ select Eng2AntiIceBtn1F - - /controls/switches/annun-test - 1 - + + + /controls/switches/rengfault + 1 + + + /controls/switches/annun-test + 1 + + @@ -4742,7 +4769,7 @@ - /controls/deice/rengine + /controls/switches/reng 1 diff --git a/Models/Instruments/OHpanel/res/buttonsCargoSmoke-grid.png b/Models/Instruments/OHpanel/res/buttonsCargoSmoke-grid.png new file mode 100644 index 0000000000000000000000000000000000000000..e053c545e2f22bb6fb491dbcbbc371bb36613745 GIT binary patch literal 8668 zcmbtaWmHsA*Pfv}MY<)V8zcshmKq6>kQ4=_yBkqj0cjW->5>6y5Rj5)=mC+Ap<`fX zK77AF-`{tAKkho`?tAvWXFuz%{hagM^9ih{K}y6x1ONa?wKP=?007{97YHE0yKgK! z%HP~Kc(&RassIci2LKopQh0lBA#~F;^#lNjssCL-KvoXjy%FC_OIHnl9Uqq*2an3e z@!P$L+0p2wmx`;iv%QPg{Vf2X;$d&&W&fJZ*U`&?O+!l;{94E!9{^wjXsIe2`7Ivi z`e!`Y%pFvmUGZccbtC9=`{g$Dgbad(6%mV9^oNEf{ykYrf|ia1>!q>1zM>Xzt z5!`!w0aefB|4^>@c?_|0Kz<4KZOX6>c9V!>i?0~oYRu}uypZL4jTQS>{(1i8rIo7z z`>0OD6{^Fv!?-#%HMP7YwW5L#@b3M4O4U&5KcC;R5qty^M6ltp5k%01u@Tq;BG~@F zhRp8tJ?e5x@DYEQK_pDV2eLX9F;$?d=%)-KxqP=PA3|kcuZRvBJuO&HE(@Ng4wKU_ z7J}#A=|4XR?wn&nwYb6M2qxjH$TARC`H7FP>I4Xuahz9z*Hgx|WBg%b)*d~xWln*z zCxD3efsgr@`p}_|Qm;@Ga|O=i7lki)-R+gD!QcdfcfTv*&k8TW;6ydFDb{!TmoQ+8cYfAUq$1RO{Fhf`#=b1rY$kO}&guHA znoY+}z5=pL3M=CXJ85fik592F@`stPRnnAh#z$KLQlc82ivqs6kU`apa$ZBv2uyvk zg5b?V)ld_1pwZ0HM)PlXSi_|YZZ(z4gdlJx(u__s6W_iaW&lccx8$Afm!AikWA6?@ zM<`J%Abhth+LGF@?LY3}E2GIc&8!&fjkrWPPU0Ga*E(>xBja5@aho13)ChzM0_JU^&b3OdcPoBUpdq1cW~Nc(DCj%djrzn_ycVDACz z-#snYov^PIHd*1`KOn6v&X|{U2txgF(FJ09p3u9@At>V@rm$;-GmO6T*e2!k=7*sS zdTyrRV8BHSh+bkoPF6&H4&Pr1uHn2Fb`d`McWHCIYX>2Q4d$mwWe@0)zyV7~3u|6b zD>6;?ePajB4DY0f$Fjbp6j8u4Oh{4W$L9U#^-4SSapuh=91+9z5+53XHZ3Z=cCB<(eij0NaG!&Ji$QC<;aw+ zX7<_s4r31t{JTW@5uM1{I-RjicT|vg+=Izz8GL^yGL8Sfh`6+hth=4;*X)bvZwg9J z-nebEAoqkPSnrOPIN&u(=f3VZ;2KE0-Y8+(q~**hT?$_{-=10DkArXQwz5vcTPOFptg3$7AKePNUa9`kv$=ij z2|6*y>3QHj>hia*6gyJREVQJ!_~&;-b45i37NoiPq4K#e=jn)2#G36-0FE+=5(SPZ zK$+rSp8}iWzctjcKJ)he&ezXIKy_b&*P02GRtb3#I1f;pxnciR6)w_5HUe}F6(JtS znvWMAOtzsx@6wkYm+n5He^0@))6;!T8mKC>S^@B|IJJ@oQwCzu!>czE2bQ*N?e{~b z6&>-wlAgdAJ{Ov3i+5OsUE&w|ixdzq%c7#E#%^;PkadQa8{#F+L-{)h9h9LM;SSD8 zuKM8@x!qTx`J;v((OUf}6{AE)f+myjC!2gwAZ}0pKN5*Mc_O*7F_5pOvS88dH5wiP zJm>w5yEcC!<$%grzhf<93jLHMUDcfGvh(`I3Xia1!wIq_5jy?oRWm!XZ3e)dCmP9x zOWsiC!3IcUhtqCv163T>+YYwcB+}+YD=*}#P}YtX+xv1zg8&xh;kUOw&nl_!X(3r_ zm>WKlXcJmuKno{HOG|TNz2vh`K_rZ`D-f9@?_QYY?Fi!~Yh}GdKOIbV^$rG2))+u< zFd5hV7Y_uPHEy+Oa_+RPh|=Rr-eA0EoC6Z54|}-Cm{mH}49Beg$og*nG9_UZ)iZJ*7^opK5qh>760=TLgq~6 zcXIwdM9SYBe{X_9P4&t;IuaVm#`clRzJG7dpOkccvx^CKH;27!@R)Eb%?S=~dNyfA z!p58c~PgtsN$5OC5@qTd$e;W?0v^l3*#3wI;X|feC*%RCbh2!PjU0OxCo47^$0YVZMIo)m6+W?@p7bQJQU>4+S=+rrK$FB ziV$w}ACB)uoPO)>7B>SWp^&4Gpoa&Wo9CwRv=@BHIAC$?hmD@Ysj1VbY5v1W@eCis zmAQ;HR9(pGN$Cq&WlW{-0-@6a;S3S6emX-|e9jMO9@IFaF`O zV4<)xTXV=I2;=$(;CnobWQnicnf^B0jt!}N+=JTXNX+|(}-QfQ7`8q9 zyzz;w<6{~W{-AubRaZDu?zvD}k?7RuHt}+)Pj|?4nb8#``Lio=5&FMez;~aO(Mh zPh;GM*%Kn{l}KV9Myh1rbu@_Y19~=uH2;!Ud$``q2z+dF>V|MA#+7cJ9Obyj3qje7+fQX41v>0FKJQ^F#di}RtN=Rx#x8Q9U- zJI{+>4cEU>Yzi7k?#@1U4Gte5tu)R4BY(Jb`&d`OvcTiO!tq;SSCQt>c%|48@eFYocZ&=T8-p! zChOLskzm|;70UWu`{+R=6^gp|KZGGBHd7Z!nAUOT_&AeeuchiF4*h%fo+#MTx;qlA z{&Bb#BbJPZ#b)=CQp8Ta&R;1ATMOMkHvI31Feh3+wtH1VQZjQDT3oD3q(g!2X5L4x zpdPPu-!t9tjipp=lM)rer&B7$@zU&za;G|34cz1E^S~6$}G=# z^E2V9eW*s}BqP~)(qQ2_S3b4A@&0)vk3pH-w64$JwV~IwsTF73a<*EV^}FxxcIEY@ z7_!p#_m>A-TpLJ47wi!uucNg}`j*%qC3y!g%z+JP1P8RaIeT>WoJwB#AG~n<^6KSD zi*3W(KPwa3izfkJjDPFR3_Im1__$X&)j$SBzyr6xhx1b|#8P~dviY8ix!C`x=dkbd z=4xmV%RXtT7Hd^Da=a_-Sa|=n4A{?vLkq)A`pDn%jYKW*e^(#N(el=uQ7SC>55GKA zAIGb~DaA&Gaja3);rkK4#ButRyhRClIB$P_)fMhTeKQ2?BqRY=kYFz3=gz+IZL=s0 zFX-y#%q@>Tu6UMNF@+VhbyA1tM}N&v@zFhGwyrwkmn&Bt9bHXmC-F-PZox|46DC6g zgFR=Akr&Q}8_hDW-z#_U4cv_7G@jK`%^ZF} zAtauYy}^v88b8Y2xDhWkC)(qAcy_B3-*CQ<0Xd&8=FMJ_|Kz0=E+^g)*ihUZ2CeQqq`fs!6}a9z&vbp zF>5{n%C4m|Z;q9 zG@r5ElI3tZ<_Rutj+v3__#az5!1m5XNlzUDda=XxS+?${Ei+gE-7oj#feFsBFnc0O z4$Ko_MpA)4lLyHo-m|hjKN>)M-NUfpe-|0JiBoc(yRxF`BV;AGL9>-#ZEaOpvC10d zioS_Av$Uv6;*)Q!7jMBeeu%wxO3irLv&%Kac$uodZ(qdl1>adZ4HugFIo=zVdl z4@z9ILkNNhm|%f_IlJ4sH`x_1SB1qlg*~&|12Py36~yt=c;0pHzHN;Q|A@BJ)0ZX| zqoVobU4>x8Nu5rTk@}7&Aa|L-B9|NH%TUJ9%oMJf1+@7@sPHLF5IN-UGBRve>5Tu^ta`z6)8Dj+>fY z9J|FKqkUKK2RHOnhiyqfD^8ihSmt3_fh-)3g*eAjUtlxM9u>TjxoM;vO9q(B%TJW@8n$FG_zwYJJ45dW;oWfra9a}0u9F3 zUX65zHP3k9&2*#;W1*H&2+osmo7)JPv(N&YTNP?=K$E1X2{sRj_i>LC1J=jm%ZH%Z z4NN2s4=2Cwfvd#9b9dFq+`gU>!8z;=vA@~jOtXvUj_fPx6kSyI@CkOfh6A}G{r>5N zo;0A0DF6M5Y@_M*YwMuiGY{(9bTzs>H9NsY!z@5iIF<@?1^$aH%?*1MhRASup1k9( zEGxGReTTHV0>L2bWZuWazvM`_g?hX-qjg%d1Nwh~jtw+%jHvA}a!*O71O~L$`NQP< zZpO|xflXRFdM*yG+XZtkh_J#l&J^RGZWV;s7LYOCJgnlIpif-|6 z%TJ;e>zX{mH@&dld>m28d;3xnp@?lY3H1fe;;@3Xp}?Qa2|^m?@4IGyc8083cCec& zlhV6*>HWkND4j0Q;4q=O=_zpQwW?(Nsz^w>1#F^?54(&=Et{~+`b;VS<3E}0rtao$ z!ZmVsAWx{CRoOe~PTCL{r{y3a-&j{`QZt9<1n>!`r#DhM%$#|XICJfBItV|aXDB)u z>`TBgDJ7fS|8N)sST6)jyqVj^qQ#~T2RWpKkUCtA!2#&>UkIG|&AjdX&+0ts6DZT* zN}+?p?8&>lWApH(^Sr~>M;~g{SEUwOMiaBKkxV~FlrDaKCNu_A+FhtO zrF|LF)Ta0nekT-`d}*n1x(~+wRf;8Hsja2;$%u?LQ>lDa52pCJ{eDGjkC*=GJ;j;V zB!v>gr?sDAk|~Njb8)I?0+dP*GgV5@@~Xg#bfsmtSvkd_VyAm?S3ei-#77oFg7x03 ze%iB!~Sam*;{%cv)kYD}kD1M8d5jVCK-F)g7Zcnw!|51b3U-90vX2pX@Hcgy+ zb$y8gz+a0yE_J^v$p27YT|M^eX7g)V+XWOG^bPOw-F3n3M@oWbDL~_hUkQgfzwidy zz$fBx3y_tSC1Cuf@>Y98|4v3(Qwt|qGnxceR8knRR1MQPXW*iuaIygmIaKZLOdd#l z(A&EB;r|D`nvrUQ?PklHrK|9^>eP4mr;Y6XXPwegYXUZIYuD+f$lZnN#$R$ePBF#u8vw@-Ye{(@Y>>262=t?H zDQ&0D(+l55`d|0oQdjCHRltx&@FV1vbBF_o@RreLg~bo8;&*80K%Sv(*eZG&(x}mw zMs0(1+ks)ndSuHiSJl-judg_R@+^Sndt+AGHbNGXltK*nW#kdVV!uYhiv;UX0D%Rf zr0TF-eCqMQhQtwx%PH1Zm^YJ(Q5m(kNz(GM#=zeC8_(+jyJK|CHBnJ0z5I=?jIYu8 z*){g@V9D|P)(MVL^y1=T9cBu+kBnt zh&~QF%!ptj6wECR<#m}<6if+Q&*2{=-i#J$7q)nT4bR5KZ3SoGhoXQp0v}lnqE92w ztaVD7nRmjX5xvxv)=MD{j*-B!2jVqi-M*zz&l4F%fE9y#Dh!%ViEN_)k+*w@>qr~@ zlx$mDx33G5J5a#l6DjA(F~*h7Cw@yZd6_MW#nK7vL~342zigZ=U_KY-k9y2WY*Ey; zKpLA=kFe-^vyFK18ilcU8{;tCk6ctEPWm`8Aos4)I5s10j?j z&L^AsM~YaXC6>h6m6eqj7{Y-tSRP^jP0zC%E7#0%%(!J#NJ*UyYfznefd8Zw2Vg|N zjCwgwVe!s=Jd|!Z#(tHu1LDs2)SSgaukSXgy{Y}=)_-LC8>3dvR|^%FN%$&63;!sj#zSa)f$tm zNYYf%hobXm9I1T^yT(YZL+#w!lA_HQG|X-0Lc0;$@2Q`*f?6EfFUx{Mb7=Ad{5>m^ z%2ubjqkAt%g0&+tT~~Dyzp5s?aKE}l`YJk8qYmY9WENPKg@&L$2kUP#Fd{nFT+0}# z1JF#c$M(nu*4+_5&%zbL?KZuex>Wy{_{%@_FC3Fii$d8)tCi2848W*BKaR9i8it%3 z)jONN$d1KoNI`H@^6{N0=r=tJq`{&@g#4(L=#9(Li2f?m%;Ee7Po)3OtK|-jXAe(m za6GZUO<{5<-Bx+&Ca7UMu3NYT&5T$^sq{=JzdyT&^5rN6j5`o89fQ0%G_H<6!1q*V zvEN*!diOrEHfk|Y<|Pm>wX772U>Am|r&-*N(-WrnPfmd^-END9HuS$P&@Gdj;z2&2aJBWuV+Bv*$5L(8%C^^)?gRFT0`R zIez56#h4wj1j`Hmbc?6Fl}iZEz#|W$VQIHyX#A&^eahtg?#|$#twtMceI&C{l$);q zQJ#fJ`uBO|Gw4lX`dnZA!^5-d@WpBCH#^2Sz7`Me?nZB?G7gJFi~aG6&|&-M&;($7 zMc7-6==DwX1&AzzDU?3lde!^!3`uM!hS@V>X^H%y*KN&r<|FYcG;%C$v5%$xX_rYT zL?MyLt(*|uWW?abfmCe6n^epug|KPx*Ac7t_3p3r<>MoIq$K*1@=mh#_6zLI3b4=l zKFlgcGpiZY z!KM+YrFsFl?&qqzfLjkwtewC^8M2ndgkAU$tBo$24l-h(CM8w4oAzBA8=GRnEdg zQJ|F>Z=XCET%@U|J|#)Bs2hMzU$hqoBj#E#YqzXcoHOYE4?_STPXks zHii$dL=v4#c0!*CH~@h#&=eQpC?y>YBra+vjvr;`;&T!bVS%*TN8~HZBopq$nTrQ_R$j)ShtDYe-2yao7)ov zFTk&ugA=dT+*?kS1!vl}bTXt!)X%41&{X``VZ3xiGz5C2%~2B;hB}PbNS`!ieKWP~ zq@K{r)WsWE*V*2Hd}ptX8Y+dU^3Z>#&A2~%Ao1@kz}ZUJ0$6DBTz~6gVe<-)8A=7F zcwL?fI!lM+QsB_qEdm;LHE5plSQqnn(7H^(FNJZvk$x{J8Vd3Pi-Cj@BtRTxH=ES` zxNRIgW)t;cXne|wicEFm?n7TQ4gfuoCW50Sh=46knIgyacjxPznIm?is$RmY4ie%9 zR{}b%_hmC1MqUG*UT@f_ahY7#WjYGu2wOPc>7HlFF9;|VZl~BJrs_7oUmF^TO&LwI zd@=2A*ylDCD=S*{fDCvb=9|p-dF(ID&jm`#dH{;CZMKxrg1(;h&d(L@t)koY@a5lj zzh#OrWQp;(6_65&G(kY6N()^&0@6e1MQMW4s}c~UN$&|A1wpzr z1EN$R^n^f?KYriEIqO`Ui?i0bc-OqM*UaqMW%jdYPqK-TE+ZW`9RL7e)YrTJ7ytm0 zet`fQDpF(P|G|~iP&pdt-Uko?g#f^?q^cWn>uzcpsO9VJ?cx(i>H+{-{w@xIF3tkM?t#w)boC#aI7_-v0{}d) z^zUn!hAi$Cg%)0&jUGnGugD_RnPqAEzVoax(QMI($FO8%3=Bx*8>D(R6nq;J63M?G ztgvu9Gqs?tbI6wMVS@;t;9-)_ueQ`8j3e%+g8KfA7$4#C!^Yiw1 zIzL@t@DV$*W~!%lh%f{u^0fA2i)LAd2F;_)H)8a089*9AXMiRRR}_mTmB9aV_Xdcf z5l<-sn5%)7e*Gh#xF|i(*Xz;xi`s7Hx(?OfkbTv(Qyc4@?Ocw5j*mIedQ~#|bQjPH z@A9<5p;C!w8h>pk@q%XC{s+ztL21IVm7fgZpAS7KhD-KN=udyLS^IYEz3{L#gRn!U zIQHD-@>R`Bh)2zvOo+#wYU#70xa^?noEujE9So>g?91ob@=~)3 zZbdpTS=ERE4Po@VkO{B>BtP10Ppbd0YC!|*?Ri9-x5pY_raX5gYc?==DMI3%YxfC= z58t>%mdhI_v()^}!23JhhRZN?v|6(7Ah+(;D?}rZ`WP!O=ozq*oxm3FHe7QrQqGY(!1iUIIN(c&Yyw^~;pQ(e(sRy1=d4>hfyv^x! zEe~yHTr8Yi*#>SE3H0d1TA}4uVy?|G`0jfa@y3--Ut04=>trnj=7>)rni!FVym54* zJMw#eLOQvwkheFVY3D&BZ!8D&HIAzOj9-ogd!OqEi=7eSu;f<221Tdu-FB-D?v%Xs z-bo8xsl=k*($~PT0}6fqM^xiV6;-_Ex<@2|eF+9cR#^aBOTCT~*EDBu^{(2@Zw21< zD0ib&I>)|4YPagUkkEku{;@V{m|Y4)n=~o2^MW+V7uZ%{3%Xx#h~aYPqPO$fRkJa^ z9q@2)j0O@W1!1cv^1nEqyR7Ie-zQ8VoEec6(N?u7Fu_Q~Xq&E;+u7}BZW{SNW6o_!%5nsH^;p03L?t^+@3KI33Mlu~pF+|zkuKaUcbj=m zBS#q%Yz~V)Ue&eMDDM=?AP6s$efV520^f|AD+g4F^p<{o6l=BpG)Gldr`oFa#j?ar z7UE}Lox*!E3fq!Fjm5WWT>uLfsqgH%)t`^+GowXWwz3Xh59W zBO6dtckoer*<7{~j(zT8iQ1lCfXSve57;;2%_*k8`_z5m?+m?J@s>3NOJ0qM!JwQH9*{!|We@t8*itJp6uWx?4GY5emv5GXq^Yq#~A9?X8XB$6JYQ+f=f zYgEegV`|ntnmpU zS{Msgw7xMV#b1_NFL*WSqiWSD|Uw=UA&#U$qC%_TGxc zgUU5J9JO#cAAp9+PD}>4%Qt&#Yk)W>0;(<;1i7kj-|sKbc=<_IhG)FO2=G+~gw$jc6^DW;d#VfrJLZ-9^HAI27~77;0+n=nqdXF7{c4gLYN;RMuh{?uCA+tan0n z_B4XH_@vVs-Jp8Sk8z^_|6VTH4c!&krukfr?Q4IVU6hSJe!QkAI9hf*A1!9nzaRW; z>1cO+9h~!tT>$R_P+IHVn{*r9G?z3|Rtx4~-ajBLhY@S&l>%ql>1UW+2{8ty%5VgO z!0wD8df9uS`}W>e$H1e2j!nPR)NrmA@Xlp=6ERm^pp;vjw44=u9yz{Zi}o>A?y&6) zy3Z_5CBokFe3p4(+8Lc_%yd|mZd*n7pOM|blUMuv9``bWA|BQ%;xG^QrwW+)9bHE; z_tIhEf6c|k!>TeLz_`?nq_z=lBTcQkAeDFt`_2>58FVl%MwC*~`)7`s!N0v(%kib{ zTbRw3^V*vcfs<_oi&=31#-p|J22f;n|NK7;23>wK;ho+m|*RRW+LXAk^=*b{Z z!0GhNDwJ^@)sun4g-xvO?Cx?A&*J3}Vcv67ciqtn$`@6d|4zHMc~3_i3tK44T{ff+ zHR!dW@_|Q(*mDNw@$!kiiIx&Sa!cUDgPCeV^WIt+O^@@!;8jGYI8poZd~rNf+dPub z29cCCSm77F(RhM!Q`>C?#@}*ia0I;H^l~F@_|pkX4t1I}upHy9|2xp#zp`4OKqfCQe~Lwz+!7LoztW42v8Usyi>mt0Zq#GI z#-*-tO_ROn(kx(h|ZrE8ro4Dhdzq*M+YA3)WlEy?ceNo&iaCS^AwQR z^C2znngKl$6kP2%iq@2Uqd9`QAIf?=?v*(FrTxp`-p4+Fu7)Yme|-0q#uSKGYRT}3 zY^xKil8j;~ZOi{WC990X3fpUyWnivF(HTS*J-zBW+Bd;X(#84aa|rugt{5CHPt=l* zqpDBjK4vRb{eRCD9&tarrtX|ViG(A)AT-}Oe$abS7gO<3+&y6l0@qXi*uh;Gl+N~J zvdLl8DP%gG1g0c55r7Rv1gGM4PKFtPZWJ%_!Rn(`T7k^fixqnJ+sxaHVTWM$-lI$HG#7 zXnX3MB!b5g3$%!-WRP7hAlCqS$uo8x!i{W-Qd;FfQEuGW?7ENgwJFFsN$BTS-b zILzk*uEmeYt~}>3v~fm`_c-c8rD6@Zd8ro@K^xVsI;cVjEi8z!xRW4qi=5IOz}ll1 zkEsuJ$KwrBB8lX#+_{mEuSfj;%60z(afGls6G?1nl>d&WU_d zV1O+3n7+{~nZG>50r!U;6A0N<|5Z3c2D6j#EI_DhB7Wj~%lO;9Do(lAl?}A#BFWHBk|E!Ad%s|HIk`6A z`Y#)z-#o#I_E$vTi~TLWBWb{f_xvWY=(oJuFS^c}f@=;cdzoV7Ju(1VbikTyllOCY zcm((1fE`g{obX&qUNw$u^%50j#Vg7WN}K$w@}+4uDs+Nk7c5>c7h5XlImc=L;b5uEvn@^`J`z~G1UPE<)No3Q>qSz}Tsk)S#zCy4C#DlSS0d+9IOlz5l9|p zdLKvHL3~Rp@HkWo6ScsVwQ-@69s5Pvbw>>rzYD7rP1>yAZTu+rRLRbVV!svzm45Q4 zF<_Z}EbpHTtUWBPq0%CuZ-;kLoU%*gxzB4STEddtVs{(G#43n}7CfG8Z(`G)mqbc$ zqo^uie4`ph|5z3u#5WY}bqxLCt0Pj^P9WAJ&gyC>d=6RC!+F0dJTbfowtc?LwyEqy z4K=0=kn4RYHUCGTl4LS^U96#RxQ#ngxFRBF_Y%)n2kY29R_NebF8U)_Y~VQ7cH_%# zHAUkn`>?RS2L_%SPG`GtB zGue4A6-LDgv%<~WdqMW=+WIy`CFz>pH2k^##`;8O=&ipf83)<|B)46Vp02TL3D4|`l&FxHd%jL9#AVEtTT-F85@uXj_1n4W z!hfvkXiO8z9~B4kUz7DByRK5+$UX*pjUAL)f$COA2E)s~2um|34=%Obs~It5S|w!H zf{JO+C;xkt56poZS&;p~$VY~;(=y9@)hk%FLwm-YtuQstfbny84_3dY?}L?UMq`bX zR9CC-ce7oru)A1U_CL~|S9o$~+(~Kca9E?8K=&~I*njXi+8s&CJD*Vmkr@LK$;UE! zS*!2_{y@813%!)%uehH;rJa!ayV}S=h>!`boHD2`f<1&Gg!S3P!KlEeC^IDICUzeA z_B@QMoMqtr1q9FVmSr$Kk_4%wvfAM!h>b%O=fF}%2O{6<0X*YTe`_~ibp6O|eum5> zeqJ6YRJ0(K40(6IioNt}si#D>=a_R5L)iJ_yeRSbTDW4Wz=u9Gb5~LgoqY#Y$xE&{ zO+grE6kY6*x{!t1FRqx2Wk?U(-@*2K#(N*4Gwxlb@RolM~6GzII! z(T~+v%SbEJNs=D~QjZA3&&U`Bk6Z!qj}MR2f!G_&?+7?0(LqsoxI&-17i zxA@vVXCG3t*f$jCS`1Im^4a*Fc&Tyn!V@m->~mKh6Iwh<>2` zmlKHy1iU850NBX{J8pVP0Kb8L5fO04{Pg~Pt$Gh-l}m1wbE+ntu0eNb+2-*z!x)3g z-oMYK%E2c!QQe6S7iuA4sw!<{cmEzm-g(P@knDaiDdx9GLt~*;=db8TaaSIh*}A&_ z=isdPWV*P@?_39Wp+zj`r#cD?);9%oIN>`FT7&x~te=dgl+D&-(Ig-`L{#1(16$M0 ztCCWG)e?^S)kVsKz4YFwp5*l|yi(hm;IrhbI>3?N)#?p3blW9heAZ-lX$K%Hp|24Y zqqLsIY(0CO5Mk?h2#f(@ciQU}jS|c;(Uk~V;%U{uui%06Q|3hn+?!ACVtD){<=B^g z^%W(HP=JTH!!o3;jj2b58E2~Q0t)%%Y0`QtGD|$W?pxxMzO%@3ULV-C$WvCYWk%hn zr5&tB*O}(WS`o~vvTl9QI^=rYu=4{hl_18kAoc-^*1n>N{)UJ3PGC;R06@`G&L%*z zQ2MKy?|4Ytu{icG$g~U&Tgz&_rtV4c(=+A|DeUvd$oj^tP#1|9`nGMae;Ev3u$sh^ zsC8gKop)mYaM=oy;2Lsv2aDaS$HKST?el^iZBPVD)626U>=}Bsx?q)K6yikA;~no* z6GZeqGzeNmU_#_B*<~U76r{uzM1C+B6NCo>Pig9Hg6G%EHu1{Gd;xqtoIj)uq!w8$6i;XDBXyFT7vxYX^eQ&i3PoY zyE!^(Kb`Nl>M{aM%b&;aBw>MEddVjNQJn~`j^9*R@Y&ZMt?GYw0b9r@@|08J6gb+A z)tEvIFhVe8TZB@fuLsfZrO@ED;hZIMO?D0JmT5S7_~g)3>cOzWTG`vPQj=hY+L!z2 zAC<}tCmg3_@jg^IoI%GU!B^Y4#t$JT+Rx#U@5*0<2VQMzwH|ZV225M z`$)I>`owhIX{mbqdF96ydM|`6WysYd<;k{7mi9G!n*ko5Y||nY@z|d~o$96u%PUfs zREikz-k=~vfxRw&;WQ$+(bqB+v9glROsP*~MU#zjUtfXYi^hhD%R1Og+sSp%xYFVN zWN*xq%va$MF!s;p>Q1{9wA@ggbb-#?$eMnC0rEP#<~mUm^yJHBU*uznE1zs`7+3G% z5S4S<7;pfUrG7cSL3Yh|B3fCE9^Bo~_LQuB$4HO3oJP+61~^s(!Av9V#Br;1zH7_r zL6Mgyzj1k=jbl|CxS9AqV=9?iOQ??f^r34dYTT+lMD{q6DUlLvo@>#tBtG!L$L@|% z`hDSC1-p=6N8^@+Z50dI0JnJ}uXnt)?I%QJNEN=O{B$`~^pdcE#zW0ypLO zh>SLTt6$YU$WF9SZPs4Ru3V+ZoJEYcK>dagy=c4RGyDZpzZ*JEJN;9i0gRZ@DvA7T zt{8Z=Q0%&EAO*o{yQ#N_&?(+R7mC z#qhX55Zi4nLf#@j=AtHqSBtVq&fZHI33U15wl*7*LQECPQsB4mx++&fdGGq+C)R88 zwsNnF7YH@+rgee~{+1Onpa<>Dg&scwN1=CnZoZX+uTYKzHcBkv{kXC_$n$PrZ*MaY f#T5sBJt2~N9m?ihg%>3Md#}{jHo9M{35oe1kk)~n literal 0 HcmV?d00001 diff --git a/Nasal/PitotIcing.nas b/Nasal/PitotIcing.nas deleted file mode 100644 index dd78eaef..00000000 --- a/Nasal/PitotIcing.nas +++ /dev/null @@ -1,35 +0,0 @@ -###################################################### -# Fail the pitot tude due to icing of the pitot tube # -# Code by Jonathan Redpath # -###################################################### - -var PitotIcingReset = func { - setprop("/systems/pitot/icing", 0.0); - setprop("/systems/pitot/failed", 1); - pitot_timer.start(); -} - -PitotIcing = func { - var icing = getprop("/systems/pitot/icing"); - var failed = getprop("/systems/pitot/failed"); - - if( icing > 0.03 ) { - if( !failed ) { - setprop("/systems/pitot/failed", 1); - } - } else if( icing < 0.03 ) { - if( failed ) { - setprop("/systems/pitot/failed", 0); - } - } -}; - -################### -# Update Function # -################### - -var update_pitotIcing = func { - PitotIcing(); -} - -var pitot_timer = maketimer(0.2, update_pitotIcing); \ No newline at end of file diff --git a/Nasal/fire.nas b/Nasal/fire.nas new file mode 100644 index 00000000..f56d7d96 --- /dev/null +++ b/Nasal/fire.nas @@ -0,0 +1,172 @@ +# A3XX Fire System +# Jonathan Redpath + +############# +# Init Vars # +############# + +var fire_init = func { + setprop("/systems/fire/cargo/fwddet", 0); + setprop("/systems/fire/cargo/aftdet", 0); + setprop("/systems/fire/cargo/fwdsquib", 0); + setprop("/systems/fire/cargo/aftsquib", 0); + setprop("/systems/fire/cargo/bottlelevel", 100); + setprop("/systems/fire/cargo/test", 0); + setprop("/controls/fire/cargo/test", 0); + setprop("/controls/fire/cargo/fwdguard", 1); + setprop("/controls/fire/cargo/aftguard", 1); + setprop("/controls/fire/cargo/fwddisch", 0); # pushbutton + setprop("/controls/fire/cargo/aftdisch", 0); + setprop("/controls/fire/cargo/fwddischLight", 0); + setprop("/controls/fire/cargo/aftdischLight", 0); + setprop("/controls/fire/cargo/fwdsmokeLight", 0); + setprop("/controls/fire/cargo/aftsmokeLight", 0); + setprop("/controls/fire/cargo/bottleempty", 0); + # status: 1 is ready, 0 is already disch + setprop("/controls/fire/cargo/status", 1); + setprop("/controls/fire/cargo/warnfwd", 0); + setprop("/controls/fire/cargo/warnaft", 0); + setprop("/controls/fire/cargo/squib1fault", 0); + setprop("/controls/fire/cargo/squib2fault", 0); + setprop("/controls/fire/cargo/detfault", 0); + setprop("/controls/fire/cargo/test/state", 0); + fire_timer.start(); +} + +############## +# Main Loops # +############## +var master_fuel = func { + var level = getprop("/systems/fire/cargo/bottlelevel"); + var fwdsquib = getprop("/systems/fire/cargo/fwdsquib"); + var aftsquib = getprop("/systems/fire/cargo/aftsquib"); + var fwddet = getprop("/systems/fire/cargo/fwddet"); + var aftdet = getprop("/systems/fire/cargo/aftdet"); + var test = getprop("/controls/fire/cargo/test"); + var guard1 = getprop("/controls/fire/cargo/fwdguard"); + var guard2 = getprop("/controls/fire/cargo/aftguard"); + var dischpb1 = getprop("/controls/fire/cargo/fwddisch"); + var dischpb2 = getprop("/controls/fire/cargo/aftdisch"); + var smokedet1 = getprop("/controls/fire/cargo/fwdsmokeLight"); + var smokedet2 = getprop("/controls/fire/cargo/aftsmokeLight"); + var bottleIsEmpty = getprop("/controls/fire/cargo/bottleempty"); + var WeCanExt = getprop("/controls/fire/cargo/status"); + var test2 = getprop("/systems/fire/cargo/test"); + var state = getprop("/controls/fire/cargo/test/state"); + var dc1 = getprop("/systems/electrical/bus/dc1"); + var dc2 = getprop("/systems/electrical/bus/dc2"); + var dcbat = getprop("/systems/electrical/bus/dcbat"); + var pause = getprop("/sim/freeze/master"); + + ################### + # Detection Logic # + ################### + + if (fwddet) { + setprop("/controls/fire/cargo/fwdsmokeLight", 1); + setprop("/controls/fire/cargo/warnfwd", 1); + } else { + setprop("/controls/fire/cargo/fwdsmokeLight", 0); + } + + if (aftdet) { + setprop("/controls/fire/cargo/aftsmokeLight", 1); + setprop("/controls/fire/cargo/warnaft", 1); + } else { + setprop("/controls/fire/cargo/aftsmokeLight", 0); + } + + ############### + # Discharging # + ############### + + if (dischpb1) { + if (WeCanExt == 1 and !fwdsquib and !bottleIsEmpty and (dc1 > 0 or dc2 > 0 or dcbat > 0)) { + setprop("/systems/fire/cargo/fwdsquib", 1); + } + } + + if (dischpb1 and fwdsqib and !bottleIsEmpty and !puase) { + var bottle = getprop("/systems/fire/cargo/bottlelevel"); + setprop("/systems/fire/cargo/bottlelevel", bottle - 0.166); + } + + if (dischpb2) { + if (WeCanExt == 1 and !aftsquib and !bottleIsEmpty and (dc1 > 0 or dc2 > 0 or dcbat > 0)) { + setprop("/systems/fire/cargo/aftsquib", 1); + } + } + + if (dischpb1 and fwdsqib and !bottleIsEmpty and !puase) { + var bottle = getprop("/systems/fire/cargo/bottlelevel"); + setprop("/systems/fire/cargo/bottlelevel", bottle - 0.166); + } + + ################# + # Test Sequence # + ################# + + setlistener("/controls/fire/cargo/test", func { + var test = getprop("/controls/fire/cargo/test"); + if (test) { + setprop("/systems/fire/cargo/test", 1); + } + }); + + if (test2 and state == 0) { + setprop("/controls/fire/cargo/fwdsmokeLight", 1); + setprop("/controls/fire/cargo/warnfwd", 1); + settimer(func(){ + setprop("/controls/fire/cargo/fwdsmokeLight", 0); + setprop("/controls/fire/cargo/warnfwd", 0); + setprop("/controls/fire/cargo/test/state", 1); + }, 0.5); + } else if (test2 and state == 1) { + setprop("/controls/fire/cargo/aftsmokeLight", 1); + setprop("/controls/fire/cargo/warnaft", 1); + settimer(func(){ + setprop("/controls/fire/cargo/aftsmokeLight", 0); + setprop("/controls/fire/cargo/warnaft", 0); + setprop("/controls/fire/cargo/test/state", 2); + }, 0.5); + } else if (test2 and state == 2) { + setprop("/controls/fire/cargo/fwddischLight", 1); + setprop("/controls/fire/cargo/aftdischLight", 1); + settimer(func(){ + setprop("/controls/fire/cargo/fwddischLight", 0); + setprop("/controls/fire/cargo/aftdischLight", 0); + setprop("/systems/fire/cargo/test", 0); + setprop("/controls/fire/cargo/test"); + setprop("/controls/fire/cargo/test/state", 0); + }, 0.5); + } + + + ########## + # Status # + ########## + + if (level < 0.1) { + setprop("/controls/fire/cargo/bottleempty", 1); + setprop("/controls/fire/cargo/status", 0); + setprop("/controls/fire/cargo/fwddischLight", 1); + setprop("/controls/fire/cargo/aftdischLight", 1); + } else { + setprop("/controls/fire/cargo/bottleempty", 0); + setprop("/controls/fire/cargo/status", 1); + setprop("/controls/fire/cargo/fwddischLight", 0); + setprop("/controls/fire/cargo/aftdischLight", 0); + } + +} + +################### +# Update Function # +################### + +var update_fire = func { + master_fire(); +} + +var fire_timer = maketimer(0.1, update_fire); + diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas index e1cddf30..27441372 100644 --- a/Nasal/hydraulics.nas +++ b/Nasal/hydraulics.nas @@ -10,6 +10,7 @@ var hyd_init = func { setprop("/controls/hydraulic/eng2-pump", 1); setprop("/controls/hydraulic/elec-pump-blue", 1); setprop("/controls/hydraulic/elec-pump-yellow", 0); + setprop("/controls/hydraulic/hand-pump-yellow", 0); setprop("/controls/hydraulic/ptu", 1); setprop("/controls/hydraulic/rat-man", 0); setprop("/controls/hydraulic/rat", 0); @@ -43,6 +44,7 @@ var master_hyd = func { var eng2_pump_sw = getprop("/controls/hydraulic/eng2-pump"); var elec_pump_blue_sw = getprop("/controls/hydraulic/elec-pump-blue"); var elec_pump_yellow_sw = getprop("/controls/hydraulic/elec-pump-yellow"); + var yellow_hand_pump = getprop("/controls/hydraulic/hand-pump-yellow"); var ptu_sw = getprop("/controls/hydraulic/ptu"); var rat_man_sw = getprop("/controls/hydraulic/rat-man"); var blue_psi = getprop("/systems/hydraulic/blue-psi"); @@ -64,8 +66,9 @@ var master_hyd = func { var yellow_pump_eng_fail = getprop("/systems/failures/pump-yellow-eng"); var yellow_pump_elec_fail = getprop("/systems/failures/pump-yellow-elec"); var ptu_fail = getprop("/systems/failures/ptu"); + var dc2 = getprop("/systems/electrical/bus/dc2"); - if (psi_diff > 500 or psi_diff < -500 and ptu_sw) { + if (psi_diff > 500 or psi_diff < -500 and ptu_sw and dc2 > 28) { setprop("/systems/hydraulic/ptu-active", 1); } else if (psi_diff < 20 and psi_diff > -20) { setprop("/systems/hydraulic/ptu-active", 0); @@ -138,6 +141,12 @@ var master_hyd = func { } else { setprop("/systems/hydraulic/yellow-psi", 3000); } + } else if (yellow_hand_pump and !yellow_leak and (getprop("/gear/gear[0]/wow") or getprop("/gear/gear[1]/wow") or getprop("/gear/gear[2]/wow"))) { + if (yellow_psi < 2900) { + setprop("/systems/hydraulic/yellow-psi", yellow_psi + 50); + } else { + setprop("/systems/hydraulic/yellow-psi", 3000); + } } else { if (yellow_psi > 1) { setprop("/systems/hydraulic/yellow-psi", yellow_psi - 50); diff --git a/Nasal/icing.nas b/Nasal/icing.nas index 4793f824..8be60447 100644 --- a/Nasal/icing.nas +++ b/Nasal/icing.nas @@ -10,14 +10,20 @@ var icingInit = func { setprop("/systems/icing/melt-w-heat-factor", -0.00005000); setprop("/systems/icing/icingcond", 0); setprop("/controls/switches/windowprobeheat", 0); - setprop("/controls/switches/windowprobeheatfault", 0); setprop("/controls/switches/wing", 0); setprop("/controls/switches/wingfault", 0); + setprop("/controls/switches/leng", 0); + setprop("/controls/switches/lengfault", 0); + setprop("/controls/switches/reng", 0); + setprop("/controls/switches/rengfault", 0); setprop("/controls/deice/wing", 0); setprop("/controls/deice/lengine", 0); setprop("/controls/deice/rengine", 0); setprop("/controls/deice/windowprobeheat", 0); - + setprop("/systems/pitot/icing", 0.0); + setprop("/systems/pitot/failed", 1); + setprop("/controls/deice/WingHasBeenTurnedOff", 0); + setprop("/controls/deice/GroundModeFinished", 0); icing_timer.start(); } @@ -33,29 +39,23 @@ var icingModel = func { var icingCond = getprop("/systems/icing/icingcond"); var pause = getprop("/sim/freeze/master"); var melt = getprop("/systems/icing/melt-w-heat-factor"); - var wing = getprop("/controls/deice/wing"); - var lengine = getprop("/controls/deice/lengine"); - var rengine = getprop("/controls/deice/rengine"); var windowprobe = getprop("/controls/deice/windowprobeheat"); var wingBtn = getprop("/controls/switches/wing"); + var wingFault = getprop("/controls/switches/wingfault"); var wingAnti = getprop("/controls/deice/wing"); var PSI = getprop("/systems/pneumatic/total-psi"); var wowl = getprop("/gear/gear[1]/wow"); var wowr = getprop("/gear/gear[2]/wow"); - - if (severity == "0") { - setprop("/systems/icing/factor", -0.00000166); - } else if (severity == "1") { - setprop("/systems/icing/factor", 0.00000277); - } else if (severity == "2") { - setprop("/systems/icing/factor", 0.00000277); - } else if (severity == "3") { - setprop("/systems/icing/factor", 0.00000554); - } else if (severity == "4") { - setprop("/systems/icing/factor", 0.00001108); - } else if (severity == "5") { - setprop("/systems/icing/factor", 0.00002216); - } + var PitotIcing = getprop("/systems/pitot/icing"); + var PitotFailed = getprop("/systems/pitot/failed"); + var lengBtn = getprop("/controls/switches/leng"); + var lengFault = getprop("/controls/switches/lengfault"); + var rengBtn = getprop("/controls/switches/reng"); + var rengFault = getprop("/controls/switches/rengfault"); + var lengAnti = getprop("/controls/deice/lengine"); + var rengAnti = getprop("/controls/deice/rengine"); + var WingHasBeenTurnedOff = getprop("/controls/deice/WingHasBeenTurnedOff"); + var GroundModeFinished = getprop("/controls/deice/GroundModeFinished"); if (temperature >= 0 or !icingCond) { setprop("/systems/icing/severity", "0"); @@ -77,9 +77,9 @@ var icingModel = func { var a = icing1 + melt; if (icing1 < 0.0 and !pause) { setprop("/sim/model/icing/iceable[0]/ice-inches", 0.0); - } else if (wing) { + } else if (wingAnti) { setprop("/sim/model/icing/iceable[0]/ice-inches", a); - } else if (!pause and !wing) { + } else if (!pause and !wingAnti) { setprop("/sim/model/icing/iceable[0]/ice-inches", v); } @@ -89,9 +89,9 @@ var icingModel = func { var b = icing2 + melt; if (icing2 < 0.0 and !pause) { setprop("/sim/model/icing/iceable[1]/ice-inches", 0.0); - } else if (lengine) { + } else if (lengAnti) { setprop("/sim/model/icing/iceable[1]/ice-inches", b); - } else if (!pause and !lengine) { + } else if (!pause and !lengAnti) { setprop("/sim/model/icing/iceable[1]/ice-inches", u); } @@ -101,9 +101,9 @@ var icingModel = func { var c = icing3 + melt; if (icing3 < 0.0 and !pause) { setprop("/sim/model/icing/iceable[2]/ice-inches", 0.0); - } else if (rengine) { + } else if (rengAnti) { setprop("/sim/model/icing/iceable[2]/ice-inches", c); - } else if (!pause and !rengine) { + } else if (!pause and !rengAnti) { setprop("/sim/model/icing/iceable[2]/ice-inches", t); } @@ -149,32 +149,33 @@ var icingModel = func { setprop("/systems/icing/icingcond", 0); } + ################# + # Wing Anti-Ice # + ################# + # Switching on the wing anti-ice setlistener("/controls/switches/wing", func { - var wingBtn = getprop("/controls/switches/wing"); - var wingAnti = getprop("/controls/deice/wing"); - var PSI = getprop("/systems/pneumatic/total-psi"); - var wowl = getprop("/gear/gear[1]/wow"); - var wowr = getprop("/gear/gear[2]/wow"); - if (wowl or wowr and wingBtn and PSI >= 10) { + # On the ground + if (wowl and wowr and wingBtn) { setprop("/controls/switches/wingfault", 1); settimer(func() { setprop("/controls/switches/wingfault", 0); setprop("/controls/deice/wing", 1); }, 0.5); settimer(func() { - setprop("/controls/switches/wingfault", 1); - setprop("/controls/switches/wing", 0); + setprop("/controls/deice/WingHasBeenTurnedOff", 1); setprop("/controls/deice/wing", 0); - setprop("/controls/switches/wingfault", 0); }, 30.5); - } else if (wingBtn and PSI >= 10 and !wowl and !wowr) { + settimer(func() { + setprop("/controls/deice/GroundModeFinished", 1); + }, 31); + } else if (wingBtn and !wowl and !wowr) { # In the air setprop("/controls/switches/wingfault", 1); settimer(func() { setprop("/controls/switches/wingfault", 0); setprop("/controls/deice/wing", 1); }, 0.5); - } else if (!wingBtn and PSI >= 10 and !wowl and !wowr) { + } else if (!wingBtn) { setprop("/controls/switches/wingfault", 1); settimer(func() { setprop("/controls/switches/wingfault", 0); @@ -183,35 +184,97 @@ var icingModel = func { } }); + if (WingHasBeenTurnedOff and !wowl and !wowr and GroundModeFinished) { + setprop("/controls/deice/wing", 1); + setprop("/controls/switches/WingHasBeenTurnedOff", 0); + } + + + # If we have low pressure we have a fault + if (PSI < 10) { + setprop("/controls/switches/wingfault", 1); + setprop("/controls/deice/wing", 0); + } + + if (PSI > 10 and wingFault) { + setprop("/controls/switches/wingfault", 0); + if (wingBtn) { + setprop("/controls/deice/wing", 1); + } + } + + ################# + # LEng Anti-Ice # + ################# + + setlistener("/controls/switches/leng", func { + if (lengBtn) { + setprop("/controls/switches/lengfault", 1); + settimer(func() { + setprop("/controls/switches/lengfault", 0); + setprop("/controls/deice/lengine", 1); + }, 0.5); + } else if (!lengBtn) { + setprop("/controls/switches/lengfault", 1); + settimer(func() { + setprop("/controls/switches/lengfault", 0); + setprop("/controls/deice/lengine", 0); + }, 0.5); + } + }); + + ################# + # REng Anti-Ice # + ################# + + setlistener("/controls/switches/reng", func { + if (rengBtn) { + setprop("/controls/switches/rengfault", 1); + settimer(func() { + setprop("/controls/switches/rengfault", 0); + setprop("/controls/deice/rengine", 1); + }, 0.5); + } else if (!rengBtn) { + setprop("/controls/switches/rengfault", 1); + settimer(func() { + setprop("/controls/switches/rengfault", 0); + setprop("/controls/deice/rengine", 0); + }, 0.5); + } + }); + + ################## + # Probe Anti-Ice # + ################## + + if (PitotIcing > 0.03) { + if (!PitotFailed) { + setprop("/systems/pitot/failed", 1); + } + } else if (PitotIcing < 0.03) { + if (PitotFailed) { + setprop("/systems/pitot/failed", 0); + } + } + setlistener("/controls/switches/windowprobeheat", func { var windowprb = getprop("/controls/switches/windowprobeheat"); - var fault = getprop("/controls/switches/windowprobeheatfault"); if (windowprb == 0.5) { # if in auto var wowl = getprop("/gear/gear[1]/wow"); var wowr = getprop("/gear/gear[2]/wow"); var stateL = getprop("/engines/engine[0]/state"); var stateR = getprop("/engines/engine[1]/state"); - var fault = getprop("/controls/switches/windowprobeheatfault"); - if (!wowl or !wowr and !fault) { + if (!wowl or !wowr) { setprop("/controls/deice/windowprobeheat", 1); - } else if (stateL == 3 or stateR == 3 and !fault) { + } else if (stateL == 3 or stateR == 3) { setprop("/controls/deice/windowprobeheat", 1); } - } else if (windowprb == 1 and !fault) { # if in ON - setprop("/controls/deice/windowprobeheat", 1); - } else if (fault) { - setprop("/controls/deice/windowprobeheat", 0); - } else { - setprop("/controls/deice/windowprobeheat", 0); + } else if (windowprb == 1) { # if in ON + setprop("/controls/deice/windowprobeheat", 1); + } else { + setprop("/controls/deice/windowprobeheat", 0); } - }); - - # If we have low pressure we have a fault - if (PSI < 10) { - setprop("/controls/switches/wingfault", 1); - } else { - setprop("/controls/switches/wingfault", 0); - } + }); } ################### diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 0dfef6b2..3f4cc247 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -198,7 +198,6 @@ setlistener("/sim/signals/fdm-initialized", func { fmgc.FMGCinit(); mcdu1.MCDU_init(); mcdu2.MCDU_init(); - icing.PitotIcingReset(); icing.icingInit(); var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/A320Family/Systems/autopilot-dlg.xml"); setprop("/it-autoflight/input/fd1", 1); diff --git a/Systems/libraries.xml b/Systems/libraries.xml index e657334a..6d049401 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -527,4 +527,25 @@ /systems/pressurization/targetvs + + + Icing Severity + gain + 1 + 0.1 + + + + /systems/icing/severity + 0-0.00000166 + 1 0.00000277 + 2 0.00000277 + 3 0.00000554 + 4 0.00001108 + 5 0.00002216 +
+ + + /systems/icing/factor +